2 files changed, 0 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 48ae5db3ae59..262bdfcc8cfa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,7 +9,6 @@ pkgbase = cdogs
 	makedepends = cmake
 	depends = sdl_mixer
 	depends = sdl_image
-	conflicts = cdogs-git
 	source = cdogs-0.5.4.tar.gz::https://github.com/cxong/cdogs-sdl/archive/0.5.4.tar.gz
 	source = hqx-for-0.5.4.tar.gz::https://github.com/cxong/hqx/archive/994249c8c4d1446afd9c05654bf7eafffd7a11bb.tar.gz
 	source = cbehave-for-0.5.4.tar.gz::https://github.com/cxong/cbehave/archive/e90cdcf2ebaedabb8f5a2595d6edf7c823a4f196.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 3b10dabff4cb..f44d8e459ec2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,6 @@ url="http://cxong.github.io/cdogs-sdl/"
 license=('GPL2')
 depends=('sdl_mixer' 'sdl_image')
 makedepends=('cmake')
-conflicts=('cdogs-git')
 source=(cdogs-$pkgver.tar.gz::"https://github.com/cxong/cdogs-sdl/archive/$pkgver.tar.gz"
         hqx-for-$pkgver.tar.gz::"https://github.com/cxong/hqx/archive/994249c8c4d1446afd9c05654bf7eafffd7a11bb.tar.gz"
         cbehave-for-$pkgver.tar.gz::"https://github.com/cxong/cbehave/archive/e90cdcf2ebaedabb8f5a2595d6edf7c823a4f196.tar.gz"