Added conflicts

2 files changed, 4 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 69f86d89a80f..457838aba87d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = timeline
 	pkgdesc = A plain-text based distributed social network build on top of git configuration manager
 	pkgver = 1.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://ajdiaz.me/timeline/
 	arch = any
 	license = GPLv3
 	depends = bash
 	depends = git
+	conflicts = timeline-git
 	source = https://github.com/ajdiaz/timeline/archive/1.2.tar.gz
 	sha256sums = c96d93fce73ce7fe06e136e3df2f89af3da21ffe85eb4fb09a41bec6857ee3b0
 
diff --git a/PKGBUILD b/PKGBUILD
index 3e9436057bb6..405f69ea81db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,13 @@
 
 pkgname=timeline
 pkgver=1.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A plain-text based distributed social network build on top of git configuration manager"
 arch=('any')
 url="https://ajdiaz.me/timeline/"
 license=('GPLv3')
 depends=('bash' 'git')
+conflicts=('timeline-git')
 source=("https://github.com/ajdiaz/${pkgname}/archive/${pkgver}.tar.gz")
 sha256sums=('c96d93fce73ce7fe06e136e3df2f89af3da21ffe85eb4fb09a41bec6857ee3b0')