Merge remote-tracking branch 'origin/master'

2 files changed, 2 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cd7a4c21bf85..4c9163a28a19 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,6 +7,7 @@ pkgbase = natscli-bin
 	license = Apache
 	provides = nats
 	conflicts = natscli
+	conflicts = natscli-git
 	source = https://github.com/nats-io/natscli/releases/download/v0.1.0/nats-0.1.0-linux-amd64.zip
 	sha256sums = 2171c34d14e72de40d9b517d4ed8dae729239e3e43e9b967cff1dfc90aeaf3df
 
diff --git a/PKGBUILD b/PKGBUILD
index a07d9e8b4a7a..24de0006f6e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ arch=(x86_64)
 url="https://github.com/nats-io/natscli"
 license=('Apache')
 
-conflicts=('natscli')
+conflicts=('natscli' 'natscli-git')
 provides=('nats')
 
 source=("https://github.com/nats-io/natscli/releases/download/v${pkgver}/nats-${pkgver}-linux-amd64.zip")