[libreoffice] 01/01: fix even more conflicts, sigh,.

[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 edcbf1c645d084a73afaaf080807f692fad1baeb
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Dec 14 23:58:37 2017 +0100

    fix even more conflicts, sigh,.
---
 changelog | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/changelog b/changelog
index 4838b4c..c7e1089 100644
--- a/changelog
+++ b/changelog
@@ -9,6 +9,15 @@ libreoffice (1:6.0.0~rc1~git20171214-1) UNRELEASED; urgency=medium
   * debian/libreoffice-common.bug-script.in: revert running aa-status;
     Might not exist and actually displaying the status needs root. People
     shouldn't run reportbug as root, though...
+  * debian/rules:
+    - stop passing --disable-report-builder to build-archs configure since
+      even though it's built the report builder doesn't work then. Move
+      from Build-Depends-Indep: to Build-Depends: again (closes: #875688);
+  * debian/rules, debian/control.in:
+      s/REPORTDESIGN/REPORTBUILDER/ while we're at it
+  * debian/copyright:
+    - mention sysui/desktop/apparmor/* copyright/license
+    - mention icon_themes/elementary*/* copyright/license
 
  -- Rene Engelhard <rene at debian.org>  Sat, 09 Dec 2017 00:22:29 +0100
 
@@ -39,29 +48,14 @@ libreoffice (1:6.0.0~beta2-1) experimental; urgency=medium
     - change BRAND_BASE_DIR in fundamentalrc so that we don't get
       /usr/lib/libreoffice/program/../program/xpdfimport calls. We know
       the path and the apparmor profile doesn't allow this
-<<<<<<< HEAD
   * debian/libreoffice-common.bug-script.in: run aa-status
-=======
-    - stop passing --disable-report-builder to build-archs configure since
-      even though it's built the report builder doesn't work then. Move
-      from Build-Depends-Indep: to Build-Depends: again (closes: #875688);
-  * debian/rules, debian/control.in:
-      s/REPORTDESIGN/REPORTBUILDER/ while we're at it
->>>>>>> origin/debian-experimental-5.4
   * debian/control.in: add gnupg to Suggests
-  * debian/copyright:
-    - mention sysui/desktop/apparmor/* copyright/license
-    - mention icon_themes/elementary*/* copyright/license
 
   [ intrigeri ]
   * debian/README.Debian: document how to debug and customize the included
     AppArmor profiles
 
-<<<<<<< HEAD
  -- Rene Engelhard <rene at debian.org>  Sat, 09 Dec 2017 00:22:29 +0100
-=======
- -- Rene Engelhard <rene at debian.org>  Tue, 12 Dec 2017 19:10:51 +0100
->>>>>>> origin/debian-experimental-5.4
 
 libreoffice (1:6.0.0~beta1-2) experimental; urgency=medium
 

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