summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorPH111P@Arch2016-06-13 19:42:36 +0200
committerPH111P@Arch2016-06-13 19:42:36 +0200
commit48dbb7ed8a242a2922bfdbb9a0d81a57b5e492a0 (patch)
tree1b4881a99c68b9fbc2d86efabb03ac944f6168e3 /PKGBUILD
parent578265f86ab3d10b966020600f318f20e62b3112 (diff)
downloadaur-48dbb7ed8a242a2922bfdbb9a0d81a57b5e492a0.tar.gz
fix conflicts
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD4
1 files changed, 2 insertions, 2 deletions
diff --git a/PKGBUILD b/PKGBUILD
index dfe77aa7718e..6ed435f7b32b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=cms-germany-git
pkgver=r3228.c3e6321
-pkgrel=1
+pkgrel=2
pkgdesc="CMS, or Contest Management System, is a distributed system for running and (to some extent) organizing a programming contest. This is a fork used for the German IOI team selection process."
arch=('i686' 'x86_64')
url="https://github.com/ioi-germany/cms"
@@ -22,7 +22,7 @@ makedepends=(
)
provides=('cms' 'isolate')
-conflicts=('cms')
+conflicts=('cms' 'isolate')
install=$pkgname.install
source=(