Add conflicts with git package

2 files changed, 4 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 63e757853c20..b0d826abf1d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = openvpn-update-resolv-conf
 	pkgdesc = OpenVPN Update resolvconf
 	pkgver = r24.994574f
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/masterkorp/openvpn-update-resolv-conf
 	arch = any
 	license = GPL
@@ -9,6 +9,7 @@ pkgbase = openvpn-update-resolv-conf
 	depends = openvpn
 	depends = openresolv
 	depends = bash
+	conflicts = openvpn-update-resolv-conf-git
 	source = https://github.com/masterkorp/openvpn-update-resolv-conf/archive/994574f36b9147cc78674a5f13874d503a625c98.zip
 	sha256sums = 7ce60ec549f953e092d1d3509fdda4a4f9029734742fa82b6e81c02b3ef02c6f
 
diff --git a/PKGBUILD b/PKGBUILD
index 6f10b097649b..95d014c4ce99 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=openvpn-update-resolv-conf
 pkgver=r24.994574f
-pkgrel=1
+pkgrel=2
 pkgdesc="OpenVPN Update resolvconf"
 arch=('any')
 url="https://github.com/masterkorp/openvpn-update-resolv-conf"
@@ -9,6 +9,7 @@ depends=('openvpn' 'openresolv' 'bash')
 source=('https://github.com/masterkorp/openvpn-update-resolv-conf/archive/994574f36b9147cc78674a5f13874d503a625c98.zip')
 makedepends=('zip')
 sha256sums=('7ce60ec549f953e092d1d3509fdda4a4f9029734742fa82b6e81c02b3ef02c6f')
+conflicts=('openvpn-update-resolv-conf-git')
 
 package() {
   # Install vim files.