[libreoffice] 01/01: fix merge

[Rene Engelhard]

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

rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.

commit 8ab7ab918cd58e4fe2f75c934a9e06f04d5218d6
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Dec 14 23:51:15 2017 +0100

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

diff --git a/rules b/rules
index 1279172..5de5245 100755
--- a/rules
+++ b/rules
@@ -3205,12 +3205,9 @@ endif
 		ln -s /usr/share/doc/libreoffice-common/examples/$$i $(PKGDIR)-common/$(OODIR)/share/registry/$$i; \
 	done
 
-<<<<<<< HEAD
-=======
 	# this only works with --without-fonts. Otherwise we get all stuff here,
 	# not only the Symbol->OpenSymbol part... But we don't support --with-fonts
 	# build here right now anyway.
->>>>>>> origin/debian-experimental-5.4
 ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
 	mv $(PKGDIR)-common/$(OODIR)/share/truetype/fc_local.conf \
 		debian/fonts-opensymbol/usr/share/fontconfig/conf.avail/30_opensymbol.conf

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