This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit 911e0b4a869d91b58ab92f5d8adaaaa135a62a56
Author: Rene Engelhard <r...@debian.org>
Date: Wed Sep 23 15:07:30 2015 +0200
fix (old) merge
---
changelog | 4 ----
1 file changed, 4 deletions(-)
diff --git a/changelog b/changelog
index 8a3c0bb..7f2d0ae 100644
--- a/changelog
+++ b/changelog
@@ -155,11 +155,7 @@ libreoffice (1:5.0.1~rc1-1) unstable; urgency=medium
* debian/control.in: suggest breeze-icon-theme in -style-breeze (like the
other ones do for oxygen/tango)
-<<<<<<< HEAD
- -- Rene Engelhard <r...@debian.org> Sat, 08 Aug 2015 13:43:28 +0000
-=======
-- Rene Engelhard <r...@debian.org> Sat, 08 Aug 2015 16:06:34 +0200
->>>>>>> libreoffice_5.0.1_rc1-1
libreoffice (1:5.0.0~rc5-1) experimental; urgency=medium
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
