[debian-edu-commits] debian-edu/ 01/01: fix messed up debian-edu-wheezy-manual.nb.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 3025d17b5b39a014da40f5a1e81f021a7c9d678e
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Thu Apr 3 13:14:24 2014 +0200

    fix messed up debian-edu-wheezy-manual.nb.po file
---
 documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
index 03b262f..a92acfd 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
@@ -5,12 +5,9 @@
 # Ole-Anders Andreassen <olea at skolelinux.no>, 2010.
 # Jan Roar Roed <janroed at gmail.com>, 2010.
 # Petter Reinholdtsen <pere at hungry.com>, 2012.
-<<<<<<< HEAD
 # Ole-Erik Yrvin <oeyrvin at hagan.no>, 2014.
-=======
 # Hans Arthur Kielland Aanesen <hans at eprforum.no>, 2014.
 # Ingrid Yrvin <iyrvin at hagan.no>, 2014.
->>>>>>> 519fb1f86231a228d41052e781917ae8b21bc923
 msgid ""
 msgstr ""
 "Project-Id-Version: release-manual.nb\n"

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