[libreoffice] 05/05: fix merge error
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 3a6c1628894951e5efc019fc2b5f0bf5c7cd897f
Author: Rene Engelhard <rene@debian.org>
Date: Sun Nov 8 12:25:45 2015 +0100
fix merge error
---
changelog | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/changelog b/changelog
index 11a128e..8505939 100644
--- a/changelog
+++ b/changelog
@@ -38,15 +38,6 @@ libreoffice (1:5.1.0~alpha1-2) experimental; urgency=medium
- recommend -gtk3 again in gnome as (even in Alpha1)
Save As.. works (at least for me...) - closes: #681180
- remove l10ntools build hack again, now obsolete
- * debian/control{.sdk}.in, debian/rules, debian/libreoffice-dev-doc.links:
- - stop moving the SDK docs into libreoffice-devs /usr/share/doc (and move
- the stuff installed into /usr/share/doc/libreoffice/sdk in libreoffice-dev
- to /usr/share/doc/libreoffice-dev, too) and conflict against
- libreoffice-dev / libreoffice-dev-doc (<= 1:5.0.3~rc1-2) where needed
- (closes: #803272, #803306)
- * debian/control.ure.in:
- - also break libreoffice-common in ure in addition to Replaces:
- (closes: #801552, #803565) and make it << 1:4.5.0 which was meant...
-- Rene Engelhard <rene@debian.org> Sat, 24 Oct 2015 18:52:43 +0200
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: