[libreoffice] 02/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-5.3
in repository libreoffice.

commit 4b6cb7a4cef0a7e9578fdcc34a427bffe73d4fd3
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Dec 23 21:20:28 2016 +0100

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

diff --git a/changelog b/changelog
index 3d29431..58fc092 100644
--- a/changelog
+++ b/changelog
@@ -10,8 +10,6 @@ libreoffice (1:5.3.0~rc1~git20161223-1) UNRELEASED; urgency=medium
 
   * debian/control.ogltrans.in:
     - add Conflicts: libreoffice-gtk3 (<< 1:5.2.4~rc2)
-  * debian/tests/junit-subsequentcheck:
-    - apply disable-flaky-tests.diff
 
   * debian/rules:
     - change glew conditionals/build-deps to epoxy

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