[debian-edu-commits] debian-edu/ 01/01: Fix merge error.

[Petter Reinholdtsen]

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

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

commit ceb1ba4a08bc1107c186c6afdacc5ff8ea1833de
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Wed Feb 8 11:37:04 2017 +0100

    Fix merge error.
---
 documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
index 5b42ff6..226a054 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
@@ -21,15 +21,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-<<<<<<< HEAD
 "POT-Creation-Date: 2017-01-20 12:40+0000\n"
-"PO-Revision-Date: 2017-01-23 09:39+0000\n"
-"Last-Translator: Ole-Erik Yrvin <oeyrvin at gmail.com>\n"
-=======
-"POT-Creation-Date: 2016-12-16 15:09+0100\n"
 "PO-Revision-Date: 2017-02-05 11:34+0000\n"
 "Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
->>>>>>> 2d3b606... Translated using Weblate (Norwegian Bokmål)
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
 "edu-documentation/debian-edu-stretch/nb/>\n"
 "Language: nb\n"

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