[neon/extras/calligra/Neon/unstable] debian: fix merge

[Jonathan Riddell]

Git commit f1af50738d7c729040defff85409804908c93b84 by Jonathan Riddell.
Committed on 13/11/2020 at 17:29.
Pushed by jriddell into branch 'Neon/unstable'.

fix merge

M  +0    -4    debian/calligra-libs.install.amd64
M  +0    -4    debian/calligrasheets.install.amd64

https://invent.kde.org/neon/extras/calligra/commit/f1af50738d7c729040defff85409804908c93b84

diff --git a/debian/calligra-libs.install.amd64 b/debian/calligra-libs.install.amd64
index cc43338..5b223f0 100644
--- a/debian/calligra-libs.install.amd64
+++ b/debian/calligra-libs.install.amd64
@@ -31,10 +31,6 @@ usr/lib/*/qt5/plugins/calligra/dockers/calligra_docker_stencils.so
 usr/lib/*/qt5/plugins/calligra/pageapptools/kopabackgroundtool.so
 usr/lib/*/qt5/plugins/calligra/shapes/calligra_shape_artistictext.so
 usr/lib/*/qt5/plugins/calligra/shapes/calligra_shape_chart.so
-<<<<<<< HEAD
-usr/lib/*/qt5/plugins/calligra/shapes/calligra_shape_chart.so
-=======
->>>>>>> Neon/stable
 usr/lib/*/qt5/plugins/calligra/shapes/calligra_shape_formula.so
 usr/lib/*/qt5/plugins/calligra/shapes/calligra_shape_music.so
 usr/lib/*/qt5/plugins/calligra/shapes/calligra_shape_paths.so
diff --git a/debian/calligrasheets.install.amd64 b/debian/calligrasheets.install.amd64
index 900df75..31463c7 100644
--- a/debian/calligrasheets.install.amd64
+++ b/debian/calligrasheets.install.amd64
@@ -37,10 +37,6 @@ usr/share/applications/org.kde.calligrasheets.desktop
 usr/share/calligrasheets/
 usr/share/config.kcfg/calligrasheets.kcfg
 usr/share/doc/HTML/*/calligrasheets/
-<<<<<<< HEAD
-=======
-usr/share/doc/HTML/*/sheets/
->>>>>>> Neon/stable
 usr/share/icons/hicolor/*/apps/calligrasheets.png
 usr/share/icons/hicolor/scalable/apps/calligrasheets.svgz
 usr/share/kservices5/ServiceMenus/calligra/sheets_print.desktop