[neon/kde/marble/Neon/release-lts] debian: merge

[Jonathan Riddell]

Git commit efa5acd8f35986f0eaffd7cf20df7d32955e5ec4 by Jonathan Riddell.
Committed on 22/04/2021 at 13:38.
Pushed by jriddell into branch 'Neon/release-lts'.

merge

M  +0    -11   debian/control

https://invent.kde.org/neon/kde/marble/commit/efa5acd8f35986f0eaffd7cf20df7d32955e5ec4

diff --git a/debian/control b/debian/control
index 2484d87..8fcb15c 100644
--- a/debian/control
+++ b/debian/control
@@ -203,7 +203,6 @@ Description: globe and map widget (no KDE dependencies)
  .
  This package is part of the KDE education module.
 
-<<<<<<< HEAD
 Package: libmarble-dev
 Architecture: any
 Section: libdevel
@@ -215,16 +214,6 @@ Depends: libastro-dev (= ${binary:Version}),
          ${sameVersionDep:qtbase5-dev:libmarblewidget-qt5-28},
          ${shlibs:Depends}
 Description: development files for the Marble globe widget library
-=======
-Package: marble-qt-data
-Architecture: all
-Section: misc
-Multi-Arch: foreign
-Depends: ${misc:Depends}
-Breaks: marble-data (<< 4:17.08.3-3~), ${kde-l10n:all}
-Replaces: marble-data (<< 4:17.08.3-3~), ${kde-l10n:all}
-Description: Qt-only data files for Marble
->>>>>>> master
  Marble is a generic geographical map widget and framework for KDE
  applications. The Marble widget shows the earth as a sphere but does not
  require hardware acceleration.  A minimal set of geographical data is