[neon/kde/kdepim-runtime/Neon/unstable] debian: Fix rebase

[Scarlett Moore]

Git commit 523c77ca50522a1371ba44c1b6c057722177b982 by Scarlett Moore.
Committed on 07/10/2023 at 15:42.
Pushed by scarlettmoore into branch 'Neon/unstable'.

Fix rebase

M  +0    -3    debian/control

https://invent.kde.org/neon/kde/kdepim-runtime/-/commit/523c77ca50522a1371ba44c1b6c057722177b982

diff --git a/debian/control b/debian/control
index a2513b6..7d089b8 100644
--- a/debian/control
+++ b/debian/control
@@ -42,10 +42,7 @@ Build-Depends: cmake,
                kpim6-kpimtextedit-dev,
                kpim6-libkdepim-dev,
                kpim6-libkgapi-dev,
-<<<<<<< HEAD
-=======
                kpim6-kmailtransport-dev,
->>>>>>> fd61bb0 (Fix runtime dependency to kf6 version)
                kpim6-pimcommon-dev,
                libboost-atomic-dev,
                libboost-dev (>= 1.40.0-2),