[neon/qt6/qt6-tools/Neon/unstable] debian: merge release

[Jonathan Riddell]

Git commit fcec8e7d77c38c27838467cf5f46879b7f69b3c0 by Jonathan Riddell.
Committed on 25/10/2024 at 10:30.
Pushed by jriddell into branch 'Neon/unstable'.

merge release

M  +0    -8    debian/control

https://invent.kde.org/neon/qt6/qt6-tools/-/commit/fcec8e7d77c38c27838467cf5f46879b7f69b3c0

diff --git a/debian/control b/debian/control
index e2d6afa..9c3d592 100644
--- a/debian/control
+++ b/debian/control
@@ -19,19 +19,11 @@ Build-Depends: clang,
                ninja-build,
                pkgconf,
                pkg-kde-tools,
-<<<<<<< HEAD
-               qt6-base-dev (>= 6.7.0~),
-               qt6-declarative-dev (>= 6.7.0~)
-Build-Depends-Indep: qt6-base-dev (>= 6.7~) <!nodoc>,
-                     qt6-base-doc (>= 6.7~) <!nodoc>,
-                     qt6-documentation-tools (>= 6.7~) <!nodoc>,
-=======
                qt6-base-dev (>= 6.8.0~),
                qt6-declarative-dev (>= 6.8.0~)
 #Build-Depends-Indep: qt6-base-dev (>= 6.8~) <!nodoc>,
 #                     qt6-base-doc (>= 6.8~) <!nodoc>,
 #                     qt6-documentation-tools (>= 6.8~) <!nodoc>,
->>>>>>> Neon/stable
 Standards-Version: 4.6.2
 Homepage: https://www.qt.io/developers/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-tools