fix conflicts in -git packages - thx @coderobe

2 files changed, 2 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1ea66035486f..2b4c6ef91acf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -35,6 +35,7 @@ pkgbase = onivim2-git
 	makedepends = nasm
 	makedepends = python2
 	provides = onivim2
+	conflicts = onivim2
 	options = !strip
 	source = onivim2-git::git+https://github.com/onivim/oni2.git#branch=master
 	source = onivim2.install
diff --git a/PKGBUILD b/PKGBUILD
index 7d76096b3c6f..903b9e702a5b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,6 +12,7 @@ makedepends=('git' 'esy' 'ragel' 'nodejs' 'wget' 'bzip2' 'esy' 'fontconfig' 'fus
               'libglvnd' 'libice' 'libpng' 'libsm' 'libx11' 'libxcursor' 'libxext' 'libxi' 'libxinerama' 'libxrandr'
               'libxt' 'libxxf86vm' 'm4' 'nasm' 'python2')
 provides=('onivim2')
+conflicts=('onivim2')
 options=('!strip')
 install='onivim2.install'
 source=("${pkgname}::git+https://github.com/onivim/oni2.git#branch=master"