[libreoffice] 81/152: fix mismerge: l10n template

[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 e29229799d0d3028e4bdde5c0e579a5c53f93f98
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sat Jun 4 02:12:48 2016 +0200

    fix mismerge: l10n template
---
 debian-l10n/control.lang.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian-l10n/control.lang.in b/debian-l10n/control.lang.in
index 03ed95d..665f66e 100644
--- a/debian-l10n/control.lang.in
+++ b/debian-l10n/control.lang.in
@@ -1,9 +1,8 @@
 Package: libreoffice-l10n-${isocode_lower}
 Section: localization
 Architecture: all
-<<<<<<< HEAD:debian-l10n/control.lang.in
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libreoffice-common, $${misc:Depends}, ${locales_depends}
+Pre-Depends: $${misc:Pre-Depends}
+Depends: libreoffice-common, $${misc:Depends}, $${locales_depends}
 Recommends: libreoffice-core (>> $${base-version}) | language-support-translations-${isocode_firstpart} ${font_suggests}
 Provides: libreoffice-l10n-$${help-l10n-virtual-version}
 Suggests: hunspell-dictionary-${isocode_lower} | myspell-dictionary-${isocode_lower},

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