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

[Jonathan Riddell]

Git commit ce16cbbc15548ca2677d563b66ffabe9e3ea1df6 by Jonathan Riddell.
Committed on 26/10/2020 at 17:11.
Pushed by jriddell into branch 'Neon/unstable'.

merge

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

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

diff --cc debian/calligra-libs.install.amd64
index 551a7c5,5b223f0..cc43338
--- a/debian/calligra-libs.install.amd64
+++ b/debian/calligra-libs.install.amd64
@@@ -31,7 -31,6 +31,10 @@@ usr/lib/*/qt5/plugins/calligra/dockers/
  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 --cc debian/calligrasheets.install.amd64
index 31463c7,904f4f7..900df75
--- a/debian/calligrasheets.install.amd64
+++ b/debian/calligrasheets.install.amd64
@@@ -37,6 -37,7 +37,10 @@@ usr/share/applications/org.kde.calligra
  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