[debian-edu-commits] debian-edu/ 01/01: (nl) Fix messed up jessie manual po file.

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu-doc.

commit b440dcd8c16ea5199c834447fda65efb010e2d29
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sat Feb 14 22:49:19 2015 +0100

    (nl) Fix messed up jessie manual po file.
---
 documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
index 4ec5b9a..85ee286 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
@@ -5,13 +5,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-<<<<<<< HEAD
 "POT-Creation-Date: 2015-02-12 13:11+0000\n"
 "PO-Revision-Date: 2015-02-14 21:30+0100\n"
-=======
 "POT-Creation-Date: 2015-02-14 14:47+0000\n"
 "PO-Revision-Date: 2015-01-26 18:20+0100\n"
->>>>>>> d729f9ff23055415aef24e6712f67728dc0a05b1
 "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"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git