[libreoffice] 02/02: fix changelog

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit f15e62f8f2adb44c058aa5aeb0b84744e28f00c4
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Nov 30 12:38:04 2016 +0100

    fix changelog
---
 changelog | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/changelog b/changelog
index b39c7a4..30680f3 100644
--- a/changelog
+++ b/changelog
@@ -45,11 +45,7 @@ libreoffice (1:5.2.3-1) unstable; urgency=medium
       we're getting a >= 1.1.7 dependency
       Fix adding the libmysqlcppconn-dev Build-Dep in the default case
 
-<<<<<<< HEAD
  -- Rene Engelhard <rene at debian.org>  Tue, 15 Nov 2016 22:02:43 +0100
-=======
- -- Rene Engelhard <rene at debian.org>  Wed, 23 Nov 2016 12:43:18 +0100
->>>>>>> 2736463... (actually) add MPL-2.0 and the ASF blurb appearing in some files
 
 libreoffice (1:5.2.3~rc3-1) unstable; urgency=medium
 

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