[neon/neon-packaging/kwin-selenium-tester/Neon/unstable] debian: comment out the conflict

Carlos De Maine null at kde.org
Thu Nov 28 00:29:30 GMT 2024


Git commit 93e2a4e2704c88c74e62dd1ddfc2099faa0cb8a9 by Carlos De Maine.
Committed on 28/11/2024 at 00:29.
Pushed by carlosdem into branch 'Neon/unstable'.

comment out the conflict

M  +1    -1    debian/control

https://invent.kde.org/neon/neon-packaging/kwin-selenium-tester/-/commit/93e2a4e2704c88c74e62dd1ddfc2099faa0cb8a9

diff --git a/debian/control b/debian/control
index 2310ef6..50c415b 100644
--- a/debian/control
+++ b/debian/control
@@ -106,7 +106,7 @@ Depends: kf6-kcolorscheme,
          kwayland,
          ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: kwin-wayland
+#Conflicts: kwin-wayland
 Description: KDE window manager, selenium tester version
  KWin (pronounced as one syllable "kwin") is the window
  manager for the KDE Plasma Desktop. This is the wayland


More information about the Neon-commits mailing list