[libreoffice] 01/01: fix merge
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 1e4248e6a9d2f724518e3e174ac55747bd8683f6
Author: Rene Engelhard <rene@debian.org>
Date: Wed Jul 27 06:32:29 2016 +0200
fix merge
---
changelog | 3 ---
1 file changed, 3 deletions(-)
diff --git a/changelog b/changelog
index 5d49295..3138f5f 100644
--- a/changelog
+++ b/changelog
@@ -2,9 +2,6 @@ libreoffice (1:5.1.5~rc2~git20170726-1) UNRELEASED; urgency=medium
* new upstream snapshot
- * debian/patches/jre-update-gt-99.diff: backport from libreoffice-5-2;
- allow java update version number > 99
-
-- Rene Engelhard <rene@debian.org> Tue, 26 Jul 2016 11:47:21 +0200
libreoffice (1:5.1.5~rc1-1) unstable; urgency=medium
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: