[libreoffice] 01/03: fix merge

[Rene Engelhard]

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

rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.

commit d56efd9f6e90aa3eaf995ad4cb31aae066fe6c7c
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Jun 15 19:51:49 2017 +0200

    fix merge
---
 changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog b/changelog
index 0405799..e0c2e26 100644
--- a/changelog
+++ b/changelog
@@ -4,7 +4,7 @@ libreoffice (1:6.0.0~alpha0~git20170612-1) UNRELEASED; urgency=medium
 
  -- Rene Engelhard <rene at debian.org>  Thu, 18 May 2017 12:54:08 +0200
 
-libreoffice (1:5.4.0~beta1-1) UNRELEASED; urgency=medium
+libreoffice (1:5.4.0~beta2-4) UNRELEASED; urgency=medium
 
   * debian/patches/gb_SUPPRESS_TESTS.diff: add more tests to suppress
     (from master)

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