Fix missed bad merge in nl po ile

ckan · Dec 14, 2018 · bdd02c4 · bdd02c4
1 parent 1431a83
commit bdd02c4
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/ckan/i18n/nl/LC_MESSAGES/ckan.po b/ckan/i18n/nl/LC_MESSAGES/ckan.po
@@ -3,11 +3,8 @@
 # This file is distributed under the same license as the ckan project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
 #
-<<<<<<< HEAD
-=======
 # Translators:
 # Adrià Mercader <adria.mercader@okfn.org>, 2018
->>>>>>> 0d80c9715... Update po files
 #, fuzzy
 msgid ""
 msgstr ""