[debian-edu-commits] debian-edu/debian-edu-doc.git (#536) - wheezy (branch) updated: 1.3_20090801_5.0.2+edu0_alpha-7-g343929c

[David Prévot]

The branch, wheezy has been updated
       via  343929c62fb3e35e36445c1ff3d0831e048987e8 (commit)
      from  57edec84920a9928dd6cb56e1d760e223f3a8ee4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 documentation/debian-edu-etch/debian-edu-etch-manual.de.po |    5 -----
 1 file changed, 5 deletions(-)

The diff of changes is:
diff --git a/documentation/debian-edu-etch/debian-edu-etch-manual.de.po b/documentation/debian-edu-etch/debian-edu-etch-manual.de.po
index 39056a1..a7af294 100644
--- a/documentation/debian-edu-etch/debian-edu-etch-manual.de.po
+++ b/documentation/debian-edu-etch/debian-edu-etch-manual.de.po
@@ -45,13 +45,8 @@ msgid ""
 "This is the (<emphasis>still incomplete </emphasis>) manual for the Debian "
 "Edu Etch 3.0 release."
 msgstr ""
-<<<<<<< .mine
-"Dies ist das (<emphasis>noch unvollständige </emphasis>) Handbuch für "
-"die Version 3.0 von Debian Edu Etch."
-=======
 "Dies ist das (<emphasis>noch unvollständige </emphasis>) Handbuch für das "
 "Debian Edu Etch 3.0 Release."
->>>>>>> .r58706
 
 # type: Content of: <article><section><para>
 #: debian-edu-etch-manual.xml:10


hooks/post-receive
-- 
debian-edu-doc.git (Debian package debian-edu-doc)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "debian-edu-doc.git" (Debian package debian-edu-doc).