diff options
| author | PH111P@Arch | 2016-06-13 19:42:36 +0200 |
|---|---|---|
| committer | PH111P@Arch | 2016-06-13 19:42:36 +0200 |
| commit | 48dbb7ed8a242a2922bfdbb9a0d81a57b5e492a0 (patch) | |
| tree | 1b4881a99c68b9fbc2d86efabb03ac944f6168e3 | |
| parent | 578265f86ab3d10b966020600f318f20e62b3112 (diff) | |
| download | aur-48dbb7ed8a242a2922bfdbb9a0d81a57b5e492a0.tar.gz | |
fix conflicts
| -rw-r--r-- | .SRCINFO | 3 | ||||
| -rw-r--r-- | PKGBUILD | 4 |
2 files changed, 4 insertions, 3 deletions
@@ -1,7 +1,7 @@ pkgbase = cms-germany-git 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. pkgver = r3228.c3e6321 - pkgrel = 1 + pkgrel = 2 url = https://github.com/ioi-germany/cms install = cms-germany-git.install arch = i686 @@ -44,6 +44,7 @@ pkgbase = cms-germany-git provides = cms provides = isolate conflicts = cms + conflicts = isolate source = git://github.com/ioi-germany/cms.git source = git://github.com/ioi-germany/isolate.git sha256sums = SKIP @@ -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=( |