fix a bad commit

2014-11-22 15:10:42 +01:00
parent bd63874d2a
commit da70da90da
56 changed files with 5 additions and 31429 deletions
--- a/po/create_pot_file.sh
+++ b/po/create_pot_file.sh
@@ -1,9 +1,5 @@
 #! /bin/sh

-<<<<<<< HEAD
 xgettext --from-code=UTF-8 --add-location=file \
 	--package-name=Pamac --package-version=2.0 --msgid-bugs-address=guillaume@manjaro.org \
 	--files-from=files_to_translate --keyword=translatable --output=pamac.pot
-=======
-xgettext --from-code=UTF-8 --files-from=./files_to_translate --keyword=translatable --keyword=_ --output=pamac.pot
->>>>>>> b8153ea47435633a8eb825f30c0976245b417a7e