i18n: fix german base.po

Signed-off-by: Martin Schiller <ms@dev.tdt.de>

diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po
index baea34d40cdba85424deb9dd745ebb1c811bcfcc..a70a2e98554443046a063676e6a9e1d483e26b37 100644 (file)
--- 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