From 01fe78349452b9dd93eca241715f9f2ec0c87429 Mon Sep 17 00:00:00 2001
From: Martin Schiller <ms@dev.tdt.de>
Date: Thu, 13 Sep 2018 08:21:22 +0200
Subject: [PATCH] i18n: fix german base.po

Signed-off-by: Martin Schiller <ms@dev.tdt.de>
---
 modules/luci-base/po/de/base.po | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po
index baea34d40..a70a2e985 100644
--- a/modules/luci-base/po/de/base.po
+++ b/modules/luci-base/po/de/base.po
@@ -4179,8 +4179,6 @@ msgstr "ja"
 
 msgid "« Back"
 msgstr "« Zurück"
-<<<<<<< HEAD
-=======
 
 #~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
 #~ msgstr "<abbr title='Paarweise: %s / Gruppe: %s'>%s - %s</abbr>"
@@ -4271,4 +4269,3 @@ msgstr "« Zurück"
 
 #~ msgid "IPv6 WAN Status"
 #~ msgstr "IPv6 WAN Status"
->>>>>>> 86660f92d... i18n: sync translations
-- 
2.25.1