[libreoffice] 01/01: fix merge error

[Rene Engelhard <rene@moszumanska.debian.org>]

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

rene pushed a commit to branch master
in repository libreoffice.

commit 2bd8ddd340bc142e4e5ff303ed4351e47a084ca4
Author: Rene Engelhard <rene@debian.org>
Date:   Sun May 17 11:55:11 2015 +0200

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

diff --git a/changelog b/changelog
index b561874..40db150 100644
--- a/changelog
+++ b/changelog
@@ -10,9 +10,6 @@ libreoffice (1:4.4.3-2) UNRELEASED; urgency=medium
   * debian/rules:
     - add conditional for system-collada2gltf
 
-  * merge from Ubuntu:
-    - add missing Replaces: (LP: #1443667)
-
  -- Rene Engelhard <rene@debian.org>  Sat, 09 May 2015 14:47:42 +0200
 
 libreoffice (1:4.4.3-1) unstable; urgency=medium

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