diff options
author | Alad Wenter | 2016-04-07 02:57:40 +0200 |
---|---|---|
committer | Alad Wenter | 2016-04-07 02:57:40 +0200 |
commit | 26553f77b4b374ab2b3f8ae8fb57d5a0e23afc31 (patch) | |
tree | 4ca6740bc56ce2bbab1d5deaa3dd687f4c391e8b | |
parent | da094345a059ceb1de6acc5cae6d814efb867234 (diff) | |
download | aur-26553f77b4b374ab2b3f8ae8fb57d5a0e23afc31.tar.gz |
fix conflicts
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Tue Apr 5 21:12:37 UTC 2016 +# Thu Apr 7 00:57:33 UTC 2016 pkgbase = mc-git pkgdesc = a text based filemanager pkgver = 4.8.16.r15.g50cca69 @@ -35,7 +35,7 @@ pkgbase = mc-git optdepends = zip: uzip extfs optdepends = p7zip: support for 7zip archives provides = mc=4.8.16 - conflicts = mc- + conflicts = mc conflicts = mc-cvs conflicts = mc-fork-svn conflicts = mc-mp @@ -30,7 +30,7 @@ optdepends=( 'p7zip: support for 7zip archives') makedepends=('git' 'libxt' 'libx11') provides=("mc=${pkgver%%.r*}") -conflicts=(mc-{,cvs,fork-svn,mp,slavz,suse}) +conflicts=(mc{,-cvs,-fork-svn,-mp,-slavz,-suse}) backup=('etc/mc/edit.indent.rc' 'etc/mc/filehighlight.ini' 'etc/mc/mcedit.menu' |