[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 9ed4cfafeadba1508ee87a4cff675e2698b9694e
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Jul 14 00:17:48 2017 +0200

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

diff --git a/rules b/rules
index 5d56f2a..abf2a3e 100755
--- a/rules
+++ b/rules
@@ -268,11 +268,7 @@ ifeq "$(ENABLE_JAVA)" "y"
         RUN_MAKE_CHECK=n
       else
         RUN_MAKE_CHECK=y
-<<<<<<< HEAD
-=======
       endif
-        RUN_MAKE_UICHECK=y
->>>>>>> origin/debian-experimental-5.4
         ifeq "$(DEB_HOST_ARCH)" "i386"
 	  ENABLE_JUNIT4=y
         endif
@@ -288,11 +284,7 @@ ifeq "$(ENABLE_JAVA)" "y"
         RUN_MAKE_CHECK=n
       else
         RUN_MAKE_CHECK=y
-<<<<<<< HEAD
-=======
       endif
-        RUN_MAKE_UICHECK=y
->>>>>>> origin/debian-experimental-5.4
         ifeq "$(DEB_HOST_ARCH)" "i386"
 	  ENABLE_JUNIT4=y
         endif

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