[libreoffice] 01/01: 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 a312be1a89d2640eaca95fbff9a8253a44f03383
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Dec 19 07:51:42 2016 +0100

    fix changelog...
---
 changelog | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/changelog b/changelog
index 4780a1f..ac3c16e 100644
--- a/changelog
+++ b/changelog
@@ -15,14 +15,6 @@ libreoffice (1:5.2.4~rc2-1) UNRELEASED; urgency=medium
 
  -- Rene Engelhard <rene at debian.org>  Sun, 11 Dec 2016 13:31:35 +0100
 
-libreoffice (1:5.3.0~beta2-1) experimental; urgency=medium
-
-  * New upstream beta release
-
-  * debian/patches/m68k-alignment.diff: add patch from John Paul Adrian
-    Glaubitz to fix m68k alignment
->>>>>>> 190bde7e... ENABLE_GDRIVE=y again on armhf and arm64
-
 libreoffice (1:5.2.4~rc1-1) unstable; urgency=low
 
   * New upstream release candidate

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