[libreoffice] 06/06: fix merge

[Rene Engelhard <rene@moszumanska.debian.org>]

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 7e78eb0f67cbd8a821ca075b043210a9dee0bf32
Author: Rene Engelhard <rene@debian.org>
Date:   Mon Dec 21 18:52:40 2015 +0100

    fix merge
---
 changelog | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/changelog b/changelog
index c1874cc..e889b99 100644
--- a/changelog
+++ b/changelog
@@ -16,19 +16,6 @@ libreoffice (1:5.1.0~rc1-2) experimental; urgency=medium
 
 libreoffice (1:5.1.0~rc1-1) experimental; urgency=medium
 
-  * reupload with correct 1:5.0.4~rc1-1 base... 
-
- -- Rene Engelhard <rene@debian.org>  Mon, 14 Dec 2015 16:30:44 +0100
-
-libreoffice (1:5.0.4~rc2-1) unstable; urgency=medium
-
-  * New upstream release candidate
-
- -- Rene Engelhard <rene@debian.org>  Fri, 11 Dec 2015 08:11:41 +0100
-
-libreoffice (1:5.0.4~rc1-1) unstable; urgency=medium
->>>>>>> origin/master
-
   * New upstream release candidate
     - doesn't link evoab2 to gtk2 anymore (closes: #807640)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git