[libreoffice] 78/152: fix mismerges

[Rene Engelhard]

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

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit 7fd5e4ac803d1fed7a0f082d4c78c373f43389b1
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sat Jun 4 00:44:04 2016 +0200

    fix mismerges
---
 control.in                     | 1 -
 control.subsequentcheckbase.in | 1 -
 2 files changed, 2 deletions(-)

diff --git a/control.in b/control.in
index 91bc25e..05db7bd 100644
--- a/control.in
+++ b/control.in
@@ -488,7 +488,6 @@ Description: office productivity suite -- Breeze symbol style
 
 Package: libreoffice-style-tango
 Architecture: all
-Depends: libreoffice-style-galaxy, ${misc:Depends}
 Enhances: libreoffice-core
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libreoffice-style-default, ${misc:Depends}
diff --git a/control.subsequentcheckbase.in b/control.subsequentcheckbase.in
index c094685..a19596e 100644
--- a/control.subsequentcheckbase.in
+++ b/control.subsequentcheckbase.in
@@ -4,7 +4,6 @@ Priority: extra
 Architecture: all
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libreoffice, libreoffice-sdbc-hsqldb, default-jdk, build-essential, %BUILD_DEPS_ARCH_ALL%, ${misc:Depends}
-=======
 Description: LibreOffice java test libraries
  LibreOffice subsequentchecks integration test suite
 

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