Update en.po

Fix merge error. Closes #1114 Co-authored-by: Mohit Sharma <[email protected]> Signed-off-by: hangy <[email protected]>
openfoodfacts · Sep 25, 2018 · ac9daf0 · ac9daf0
1 parent 4586d48
commit ac9daf0
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/po/openfoodfacts/en.po b/po/openfoodfacts/en.po
@@ -5,11 +5,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: en_US\n"
 "Project-Id-Version: openfoodfacts\n"
-<<<<<<< HEAD
-"PO-Revision-Date: 2017-07-10 09:00-0400\n"
-=======
 "PO-Revision-Date: 2017-09-02 10:55-0400\n"
->>>>>>> l10n_master
 "Language-Team: English\n"
 "Last-Translator: pierreslamich <[email protected]>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"