From 14315f43cb2644790910faced929dd2aee845ae1 Mon Sep 17 00:00:00 2001 From: Julien Veyssier Date: Fri, 12 Apr 2019 10:45:51 +0200 Subject: [PATCH] nothing hill --- l10n/update.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/l10n/update.sh b/l10n/update.sh index 555edc9..7c40905 100755 --- a/l10n/update.sh +++ b/l10n/update.sh @@ -7,4 +7,5 @@ git rebase master git reset --soft master git commit -m "new translations from crowdin" git checkout master -echo "ready to merge l10n_master" +git merge l10n_master +echo "MERGE DONE"