summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGFdevelop2018-10-05 22:55:38 +0200
committerGFdevelop2018-10-05 22:55:38 +0200
commit67af7c41bb8ff8c9cecc040212ff35f32dead32f (patch)
tree341d271552c2461307dea2b4abcfe825e4147711
parent457135b74e7b7ec16e8261c909ac319ca69cfd61 (diff)
downloadaur-67af7c41bb8ff8c9cecc040212ff35f32dead32f.tar.gz
fix conflict
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 938087d54287..2603d38290f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,6 +8,7 @@ pkgbase = vdeplug4-git
license = GPL2
depends = s2argv-execs
provides = vdeplug4
+ conflicts = vde2
source = git+https://github.com/rd235/vdeplug4.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 4672e85bc1ec..db5b400f37df 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ license=('GPL2')
groups=("view-os")
depends=('s2argv-execs')
provides=("$_pkgname")
-#~ conflicts=("$_pkgname" 'vde2')
+conflicts=('vde2')
source=("git+$url.git")
md5sums=('SKIP')