diff options
| author | Philip Wellnitz | 2017-01-15 22:04:54 +0100 |
|---|---|---|
| committer | Philip Wellnitz | 2017-01-15 22:04:54 +0100 |
| commit | 164e55737e7bef041c119f43c6bc555dc9fbac2c (patch) | |
| tree | 0ca755812a7d76a0cb1ce2e58d0729933d1739e7 | |
| parent | c37d378cffb97088d395d7a2f1e9bac908bfd8b1 (diff) | |
| download | aur-164e55737e7bef041c119f43c6bc555dc9fbac2c.tar.gz | |
fix conflicts
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = powerline-i3-git pkgdesc = The ultimate statusline/prompt utility. A fork containing more features for the i3 window manager. pkgver = 1.2.3 - pkgrel = 1 + pkgrel = 2 url = https://github.com/ph111p/powerline install = powerline-i3-git.install arch = i686 @@ -22,7 +22,7 @@ pkgbase = powerline-i3-git optdepends = python-google-api-python-client: Google Calendar support for the appoints segment optdepends = python-gflags: Google Calendar support for the appoints segment provides = powerline-i3 - conflicts = powerline, + conflicts = powerline conflicts = python-powerline source = git://github.com/ph111p/powerline.git sha512sums = SKIP @@ -1,6 +1,6 @@ pkgname=powerline-i3-git pkgver=1.2.3 -pkgrel=1 +pkgrel=2 pkgdesc="The ultimate statusline/prompt utility. A fork containing more features for the i3 window manager." arch=('i686' 'x86_64') url="https://github.com/ph111p/powerline" @@ -26,7 +26,7 @@ makedepends=( 'python-setuptools' ) provides=('powerline-i3') -conflicts=('powerline', 'python-powerline') +conflicts=('powerline' 'python-powerline') install=$pkgname.install source=("git://github.com/ph111p/powerline.git") |