Remove conflicts

2 files changed, 0 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c203ecb82f55..1a89468b4f38 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -23,7 +23,6 @@ pkgbase = musikcube
 	depends = ffmpeg
 	depends = taglib
 	optdepends = libopenmpt: OpenMPT support
-	conflicts = musikcube-git
 	source = musikcube-0.96.7.tar.gz::https://github.com/clangen/musikcube/archive/0.96.7.tar.gz
 	sha256sums = 81922ec6e86c06061dc009be3ec7c4bc8e8fd5ed3bb92231dabede8bbccaf723
 
diff --git a/PKGBUILD b/PKGBUILD
index a47024b2a7ba..ce2b2ea966dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,6 @@ pkgdesc='A terminal-based cross-platform music player, audio engine, metadata in
 arch=('x86_64')
 url="https://github.com/clangen/${pkgname}"
 license=('BSD')
-conflicts=("${pkgname}-git")
 depends=('faad2' 'libogg' 'libvorbis' 'flac' 'libmicrohttpd' 'lame' 'ncurses' 'boost-libs' 'pulseaudio' 'libpulse' 'libev' 'alsa-lib' 'curl' 'ffmpeg' 'taglib')
 makedepends=('cmake' 'boost')
 optdepends=('libopenmpt: OpenMPT support')