From 523c7ff856c275118575a1b2923b747b9a949037 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sun, 26 Nov 2017 00:35:23 +0530 Subject: [PATCH] translation file fix --- ungleich_page/locale/de/LC_MESSAGES/django.po | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/ungleich_page/locale/de/LC_MESSAGES/django.po b/ungleich_page/locale/de/LC_MESSAGES/django.po index 80e3af64..873bb0df 100644 --- a/ungleich_page/locale/de/LC_MESSAGES/django.po +++ b/ungleich_page/locale/de/LC_MESSAGES/django.po @@ -8,11 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -"POT-Creation-Date: 2017-10-26 03:32+0530\n" -======= -"POT-Creation-Date: 2017-11-06 00:24+0530\n" ->>>>>>> master +"POT-Creation-Date: 2017-11-26 00:34+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,12 +21,9 @@ msgstr "" msgid "Glasfaser menu" msgstr "" -<<<<<<< HEAD -======= msgid "\"Sorry, we could not find the page you are looking for!\"" msgstr "" ->>>>>>> master msgid "Toggle navigation" msgstr "Umschalten"