[neon/qt6/pyside6/Neon/unstable_jammy] debian: tidy merge

[Jonathan Riddell]

Git commit ac9bad3aa36d61bdb8eaf23f878d65d6a6e5e4b0 by Jonathan Riddell.
Committed on 09/08/2024 at 14:34.
Pushed by jriddell into branch 'Neon/unstable_jammy'.

tidy merge

M  +0    -9    debian/control

https://invent.kde.org/neon/qt6/pyside6/-/commit/ac9bad3aa36d61bdb8eaf23f878d65d6a6e5e4b0

diff --git a/debian/control b/debian/control
index c27782f..c567d77 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,7 @@ Section: python
 Priority: optional
 Maintainer: Jonathan Esk-Riddell <jr at jriddell.org>
 Build-Depends: chrpath,
-<<<<<<< HEAD
                clang,
-=======
->>>>>>> 2384487 (tidy up deps)
                cmake,
                debhelper-compat (= 13),
                dh-python,
@@ -15,8 +12,6 @@ Build-Depends: chrpath,
                libxml2-dev,
                libxslt1-dev,
                llvm-dev,
-<<<<<<< HEAD
-<<<<<<< HEAD
                mold,
                ninja-build,
                patchelf,
@@ -59,10 +54,7 @@ Build-Depends: chrpath,
                qt6-websockets-dev,
                qt6-webview-dev,
                sip-tools,
-=======
-=======
                ninja-build,
->>>>>>> 2384487 (tidy up deps)
                python3-dev,
                python3-distro,
                python3-matplotlib,
@@ -97,7 +89,6 @@ Build-Depends: chrpath,
                qt6-webengine-dev,
                qt6-websockets-dev,
                qt6-webview-dev,
->>>>>>> e38cec6 (wrap-and-sort, python pip)
                xauth,
                xvfb,
 Rules-Requires-Root: no