The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 7cc913e9c5bf7c87ba3fea82c24700cd2b06949f
Author: Rene Engelhard <[email protected]>
Date: Fri Aug 19 18:02:00 2011 +0200
missed one conflict
diff --git a/changelog b/changelog
index b1cc274..d86475e 100644
--- a/changelog
+++ b/changelog
@@ -151,11 +151,7 @@ libreoffice (1:3.4.1-1) experimental; urgency=low
- override new libreoffice source: dh_pycentral-is-obsolete line 3214
and libreoffice source: dh_python-is-obsolete line 3223
-<<<<<<< HEAD
-- Rene Engelhard <[email protected]> Wed, 06 Jul 2011 16:00:18 +0200
-=======
- -- Rene Engelhard <[email protected]> Mon, 15 Aug 2011 16:45:06 +0000
->>>>>>> origin/master
libreoffice (1:3.3.3-4) unstable; urgency=low
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
