[debian-edu-commits] debian-edu/debian-edu-doc.git (#438) - wheezy (branch) updated: 1.1_20080706-9-g3000e19

[David Prévot]

The branch, wheezy has been updated
       via  3000e1961aeabd1a3dc4886d90ede1ed616d9dbd (commit)
      from  46f28c491e7713fbc41a077526fdd0ca2378a08d (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/rosegarden/rosegarden-manual.nb.po |    2 --
 1 file changed, 2 deletions(-)

The diff of changes is:
diff --git a/documentation/rosegarden/rosegarden-manual.nb.po b/documentation/rosegarden/rosegarden-manual.nb.po
index 91b7e5f..050fc17 100644
--- a/documentation/rosegarden/rosegarden-manual.nb.po
+++ b/documentation/rosegarden/rosegarden-manual.nb.po
@@ -11,11 +11,9 @@ msgstr ""
 "Last-Translator: Alf Tonny Bätz <alfton at gmail.com>\n"
 "Language-Team: norsk <nb at li.org>\n"
 "MIME-Version: 1.0\n"
-<<<<<<< .mine
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
->>>>>>> .r42528
 
 # type: Content of: <article><articleinfo><title>
 #: rosegarden-manual.xml:3


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).