Remove conflicts

2 files changed, 0 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 13584a86e435..90b93026e155 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -19,9 +19,6 @@ pkgbase = gogs
 	optdepends = redis: Redis support
 	optdepends = memcached: MemCached support
 	optdepends = openssh: GIT over SSH support
-	conflicts = gogs-bin
-	conflicts = gogs-git
-	conflicts = gogs-dev-git
 	backup = etc/gogs/app.ini
 	source = gogs-0.12.6::https://github.com/gogs/gogs/archive/v0.12.6.tar.gz
 	source = 0001-Adjust-config-for-Arch-Linux-package.patch
diff --git a/PKGBUILD b/PKGBUILD
index 4471e361a360..ab505f716278 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -25,7 +25,6 @@ optdepends=('sqlite: SQLite support'
             'memcached: MemCached support'
             'openssh: GIT over SSH support')
 makedepends=('go>=1.3')
-conflicts=("$_pkgname-bin" "$_pkgname-git" "$_pkgname-dev-git")
 backup=("etc/$_pkgname/app.ini")
 source=("$_pkgname-$pkgver::https://github.com/$_orga/$_pkgname/archive/v${pkgver}.tar.gz"
         '0001-Adjust-config-for-Arch-Linux-package.patch'