add conflicts

2 files changed, 4 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eefec6367bb8..22a2521e345f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = stash-electron
 	pkgdesc = Stash Team Secret Manager
 	pkgver = 1.1.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Doccrazy/stash-electron
 	arch = x86_64
 	license = GPL-3.0
@@ -12,6 +12,7 @@ pkgbase = stash-electron
 	depends = nss
 	depends = libsecret
 	depends = libcurl-gnutls
+	conflicts = stash-electron-git
 	source = stash-electron_1.1.0_amd64.deb::https://github.com/Doccrazy/stash-electron/releases/download/v1.1.0/stash-electron_1.1.0_amd64.deb
 	source = LICENSE
 	sha256sums = 11cf2b414b9542db9718350dadea89628dcd4c85a0511f7be281544d9a5c3bb1
diff --git a/PKGBUILD b/PKGBUILD
index c31471b9188b..91518069278c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,12 +4,13 @@
 pkgname=stash-electron
 _appname=Stash
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Stash Team Secret Manager"
 url='https://github.com/Doccrazy/stash-electron'
 arch=('x86_64')
 license=('GPL-3.0')
 depends=('alsa-lib' 'gconf' 'gtk2' 'libxss' 'libxtst' 'nss' 'libsecret' 'libcurl-gnutls')
+conflicts=('stash-electron-git')
 
 source=("${pkgname}_${pkgver}_amd64.deb::https://github.com/Doccrazy/stash-electron/releases/download/v${pkgver}/stash-electron_${pkgver}_amd64.deb"
         "LICENSE")