From bdd02c49ab9df25ecf57796efb8390b8b0617c68 Mon Sep 17 00:00:00 2001
From: Konstantin Sivakov <konstantin.sivakov@gmail.com>
Date: Fri, 14 Dec 2018 14:23:42 +0100
Subject: [PATCH] Fix missed bad merge in nl po ile

---
 ckan/i18n/nl/LC_MESSAGES/ckan.po | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ckan/i18n/nl/LC_MESSAGES/ckan.po b/ckan/i18n/nl/LC_MESSAGES/ckan.po
index 15c2c0dcc0c..ed60fa1ac7d 100644
--- 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 ""