nothing hill

2019-04-12 10:45:51 +02:00 · 2019-04-12 10:45:51 +02:00 · 14315f43cb
parent 65454b8d26
commit 14315f43cb
1 changed files with 2 additions and 1 deletions
--- 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"