[libreoffice] 124/152: fix mismerge: ... patches files multiple times

[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 8d8192503a41c636c57fc68dcab549877900397b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Jan 16 17:55:50 2017 +0100

    fix mismerge: ... patches files multiple times
---
 patches/debian-opt.diff | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/patches/debian-opt.diff b/patches/debian-opt.diff
index f5d8c8b..e76b1c7 100644
--- a/patches/debian-opt.diff
+++ b/patches/debian-opt.diff
@@ -23,19 +23,6 @@ diff --git a/config_host.mk.in b/config_host.mk.in
  export CROSS_COMPILING=@CROSS_COMPILING@
  export CURL=@CURL@
  export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -12787,6 +12787,9 @@ fi
- AC_SUBST(MPL_SUBSET)
- 
- 
-+CDEFAULTOPT=`echo $CFLAGS 2>/dev/null | grep -E -o "\-O[[0-3]]"`
-+AC_SUBST(CDEFAULTOPT)
-+
- dnl ===================================================================
- dnl Setting up the environment.
- dnl ===================================================================
 -- 
 2.7.4
 

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