[debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] fix merge error

[Holger Levsen]

Holger Levsen pushed to branch master at Debian Edu / debian-edu-doc


Commits:
6df2f39c by Holger Levsen at 2019-01-28T14:18:08Z
fix merge error

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


1 changed file:

- documentation/debian-edu-buster/debian-edu-buster-manual.nl.po


Changes:

=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.nl.po
=====================================
@@ -6,13 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-buster-manual\n"
 "Report-Msgid-Bugs-To: debian-edu-doc at 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 at yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
 "Language: nl\n"



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/commit/6df2f39cff2d7b8c36ebb5a72f5773b70a7bbf06

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/commit/6df2f39cff2d7b8c36ebb5a72f5773b70a7bbf06
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20190128/b29aeaa1/attachment.html>