[debian-edu-commits] debian-edu/ 01/01: remove the conflicting bits

[Holger Levsen]

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

holger pushed a commit to branch jessie
in repository debian-edu-doc.

commit ad4e6ae0582c049587f9d335a0b359d69d1a3ab5
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Jun 14 14:29:55 2016 +0200

    remove the conflicting bits
---
 documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
index 6167456..5cfa326 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
@@ -16,13 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-jessie-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2016-06-14 13:18+0200\n"
-"PO-Revision-Date: 2016-05-23 13:50+0200\n"
-=======
 "POT-Creation-Date: 2016-06-14 13:12+0200\n"
 "PO-Revision-Date: 2016-06-14 14:06+0100\n"
->>>>>>> 54722ac... (de) Updated Jessie manual translation.
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
 "Language: de\n"

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