[neon/qt/qtwebengine/Neon/unstable] debian: merge salsa

[Jonathan Riddell]

Git commit 903437e8769062088c6b714f01e0354bd6537a4f by Jonathan Riddell.
Committed on 30/04/2024 at 10:42.
Pushed by jriddell into branch 'Neon/unstable'.

merge salsa

M  +0    -8    debian/control

https://invent.kde.org/neon/qt/qtwebengine/-/commit/903437e8769062088c6b714f01e0354bd6537a4f

diff --git a/debian/control b/debian/control
index a9c37c3..ebf170b 100644
--- a/debian/control
+++ b/debian/control
@@ -20,13 +20,10 @@ Build-Depends: binutils (>= 2.32-8~),
                libegl1-mesa-dev,
                libevent-dev,
                libflac-dev,
-<<<<<<< HEAD
                libfontconfig1-dev,
                libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf],
-=======
                libfontconfig-dev,
                libgl-dev (>= 1.3) [!armel !armhf],
->>>>>>> salsa/experimental
                libgl1-mesa-dri,
                libgles2-mesa-dev [armel armhf] | libgles2-dev [armel armhf],
                libglib2.0-dev,
@@ -74,12 +71,7 @@ Build-Depends: binutils (>= 2.32-8~),
                node-dagre-layout,
                node-rollup-plugin-terser,
                node-yargs,
-<<<<<<< HEAD
-               nodejs,
-               pkg-config,
-=======
                nodejs (>= 16.14),
->>>>>>> salsa/experimental
                pkg-kde-tools,
                pkgconf,
                protobuf-compiler,