[debian-edu-commits] debian-edu/ 02/02: Conflict resolved Merge branch 'master' of git+ssh://git.debian.org/git/debian-edu/debian-edu-doc

[Ole-Erik Yrvin]

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

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

commit 0e2c0211acb9d5c362f4cabdd5e41253e0b2415a
Merge: aa52c37 519fb1f
Author: Ole-Erik Yrvin <oeyrvin at hagan.no>
Date:   Sun Mar 30 19:07:10 2014 +0200

    Conflict resolved
    Merge branch 'master' of git+ssh://git.debian.org/git/debian-edu/debian-edu-doc
    
    Conflicts:
    	documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po

 .../debian-edu-wheezy-manual.nb.po                 | 43 +++++++++++++++++++++-
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --cc documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
index 3d36294,24d13da..03b262f
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
@@@ -5,7 -5,8 +5,12 @@@
  # 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