[neon/extras/kile/Neon/release] debian: merge

[Jonathan Riddell]

Git commit 993ad04256709497f1dd6b5928695b88bea02a19 by Jonathan Riddell.
Committed on 09/08/2024 at 14:21.
Pushed by jriddell into branch 'Neon/release'.

merge

M  +0    -5    debian/kile.lintian-overrides

https://invent.kde.org/neon/extras/kile/-/commit/993ad04256709497f1dd6b5928695b88bea02a19

diff --git a/debian/kile.lintian-overrides b/debian/kile.lintian-overrides
index c629754..edc7206 100644
--- a/debian/kile.lintian-overrides
+++ b/debian/kile.lintian-overrides
@@ -1,9 +1,4 @@
 kile: package-name-doesnt-match-sonames libkdeinit5-kile
-<<<<<<< HEAD
-kile: shlib-without-versioned-soname usr/lib/x86_64-linux-gnu/libkdeinit5_kile.so libkdeinit5_kile.so
-kile: postinst-must-call-ldconfig usr/lib/x86_64-linux-gnu/libkdeinit5_kile.so
-=======
 kile: shlib-without-versioned-soname usr/lib/*/libkdeinit5_kile.so libkdeinit5_kile.so
 kile: no-symbols-control-file usr/lib/*/libkdeinit5_kile.so
 kile: package-must-activate-ldconfig-trigger usr/lib/*/libkdeinit5_kile.so
->>>>>>> master