summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmurphy2016-04-09 03:12:27 +0200
committermadmurphy2016-04-09 03:12:27 +0200
commit78d863af4e7d8330a09d9c010f9895810852d7e0 (patch)
tree95121a0e90a3356443af9fcaee23b1c01bfd4541
parent3314df583e435a92f4d52bd71c296c3cb379de35 (diff)
downloadaur-78d863af4e7d8330a09d9c010f9895810852d7e0.tar.gz
Added popcorntime-ce-git among "conflicts"
-rw-r--r--PKGBUILD2
1 files changed, 1 insertions, 1 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 4d6ba9aeeaa6..4b2cf9002e24 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ license=('GPL3')
depends=('libnotify' 'desktop-file-utils' 'ttf-font' 'gconf' 'nss' 'libxtst' 'gtk2' 'alsa-lib')
optdepends=('net-tools: necessary for the new vpn feature' 'ttf-liberation: open source ttf fonts')
provides=('popcorntime')
-conflicts=('popcorntime' 'popcorntime-bin' 'popcorntime-git')
+conflicts=('popcorntime' 'popcorntime-bin' 'popcorntime-git' 'popcorntime-ce-git')
options=('!strip')
install="popcorntime-ce.install"
sha1sums=('ee6a1b9314cbcb8eeabe76e9d6928f8c0bee4f42'