[gentoo-commits] repo/gentoo:master commit in: kde-apps/kmix/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     18c1427cc47b2f64c71836d165f1fb9ac8b2dcff
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 25 18:15:04 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 25 18:15:24 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18c1427c

kde-apps/kmix: Cleanup accidentally added cruft

Amends 844f8131b00063c6e3723304f63c8b54c19d5c77

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/kmix/kmix-24.12.1.ebuild | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/kde-apps/kmix/kmix-24.12.1.ebuild b/kde-apps/kmix/kmix-24.12.1.ebuild
index eb66fa7a4ed1..e7369612f269 100644
--- a/kde-apps/kmix/kmix-24.12.1.ebuild
+++ b/kde-apps/kmix/kmix-24.12.1.ebuild
@@ -41,16 +41,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-<<<<<<< HEAD:kde-apps/kmix/kmix-24.12.1.ebuild
 PATCHES=( "${FILESDIR}/${PN}-23.04.2-autostart_disable.patch" ) # TODO: upstream
-=======
-PATCHES=(
-	# TODO: upstream
-	"${FILESDIR}/${PN}-23.04.2-autostart_disable.patch"
-	# Pending: https://invent.kde.org/multimedia/kmix/-/merge_requests/29
-	"${FILESDIR}/${PN}-24.05.2-revert-kcm_pulseaudio-dep.patch"
-)
->>>>>>> aa17c6dbaed7 (kde-apps/kmix: Reference pending upstream MR):kde-apps/kmix/kmix-24.08.49.9999.ebuild
 
 src_configure() {
 	local mycmakeargs=(