Commit 6df2f39c authored by Holger Levsen's avatar Holger Levsen
Browse files

fix merge error

parent 1fec3df0
Loading
Loading
Loading
Loading
+0 −5
Original line number Diff line number Diff line
@@ -6,13 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-buster-manual\n"
"Report-Msgid-Bugs-To: debian-edu-doc@packages.debian.org\n"
<<<<<<< Updated upstream
"POT-Creation-Date: 2019-01-28 10:13+0000\n"
"PO-Revision-Date: 2018-11-11 13:01+0100\n"
=======
"POT-Creation-Date: 2019-01-28 01:47+0000\n"
"PO-Revision-Date: 2019-01-28 15:08+0100\n"
>>>>>>> Stashed changes
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
"Language: nl\n"