summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2017-05-25 19:16:38 +0000
committerintrigeri <intrigeri@boum.org>2017-05-25 19:16:38 +0000
commit1482771fb1ef3efb9471722f872aaa3cbe353fcd (patch)
tree5b254bdac3a39aec472a611ecfb9049acf0fa53a
parent631e525b8f259dba0b9f7a6e3b035ea7412ce083 (diff)
Fix buggy merge conflict resolution.
-rw-r--r--wiki/src/support/known_issues.de.po4
1 files changed, 0 insertions, 4 deletions
diff --git a/wiki/src/support/known_issues.de.po b/wiki/src/support/known_issues.de.po
index cbe959b..deb4d93 100644
--- a/wiki/src/support/known_issues.de.po
+++ b/wiki/src/support/known_issues.de.po
@@ -7,11 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2017-05-19 17:19+0200\n"
-=======
"POT-Creation-Date: 2017-05-25 19:44+0300\n"
->>>>>>> origin/master
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"