[neon/kde/kontact/Neon/unstable] debian: Fix rebase

[Scarlett Moore]

Git commit 4a7de641fe73932761e50835d61036ed545e8c64 by Scarlett Moore.
Committed on 26/09/2023 at 18:03.
Pushed by scarlettmoore into branch 'Neon/unstable'.

Fix rebase

M  +0    -5    debian/control

https://invent.kde.org/neon/kde/kontact/-/commit/4a7de641fe73932761e50835d61036ed545e8c64

diff --git a/debian/control b/debian/control
index b6f577d..bf47713 100644
--- a/debian/control
+++ b/debian/control
@@ -9,14 +9,9 @@ Uploaders: Sune Vuorela <sune at debian.org>,
            George Kiagiadakis <kiagiadakis.george at gmail.com>,
            Eshat Cakar <info at eshat.de>,
            Maximiliano Curia <maxy at debian.org>
-<<<<<<< HEAD
 Build-Depends: cmake,
                debhelper-compat (= 13),
-=======
-Build-Depends: cmake (>= 2.8.12~),
-               debhelper-compat (= 12),
                kf6-kcodecs-dev,
->>>>>>> c7817b9 (fix deps)
                kf6-extra-cmake-modules,
                kf6-karchive-dev,
                kf6-kauth-dev,