summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authormzz20172020-12-20 14:48:50 +0800
committermzz20172020-12-20 14:48:50 +0800
commita65dfc2ef16d91570fa0931e52f1ae2f48f1bf4a (patch)
treeed99451d2ce389e6fe680a92c2bbfe59d444bb3c
parent58b3394588b5947a20c4c1dd25fd923fceebabb4 (diff)
downloadaur-a65dfc2ef16d91570fa0931e52f1ae2f48f1bf4a.tar.gz
update
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 1 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0adb7ed130e..f5f11af846a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -19,7 +19,6 @@ pkgbase = v2raya-git
depends = v2ray
provides = v2raya
conflicts = v2raya
- conflicts = v2raya-bin
source = v2raya-git::git+https://github.com/v2rayA/v2rayA
sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 48045eac9fa..47f5907d219 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ license=('GPL3')
depends=('git' 'glibc' 'v2ray')
makedepends=('go>=2:1.12.3-1' 'nodejs>=14' 'yarn' 'python2')
provides=('v2raya')
-conflicts=('v2raya' 'v2raya-bin')
+conflicts=('v2raya')
source=("$pkgname::git+$url")
sha512sums=('SKIP')