summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorYoshi28892016-08-23 16:56:24 +0200
committerYoshi28892016-08-23 16:56:24 +0200
commit9954b6af43843dbd4608c227bbd35312f5c959de (patch)
tree0d177580489fbb3c365e4b67902d5289ec961844
parentaef80e6f5c09e20a9c9543abce233f1d344bdca6 (diff)
downloadaur-9954b6af43843dbd4608c227bbd35312f5c959de.tar.gz
Fix conflicts
Signed-off-by: Yoshi2889 <rick.2889@gmail.com>
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD2
2 files changed, 3 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8bab35cce255..e5b04be142ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Aug 23 14:54:55 UTC 2016
+# Tue Aug 23 14:56:12 UTC 2016
pkgbase = soundnode-git
pkgdesc = Soundcloud client for the desktop
pkgver = r774.3175946
@@ -22,7 +22,7 @@ pkgbase = soundnode-git
depends = libnotify
depends = fontconfig
provides = soundnode
- conflicts = soundnode,
+ conflicts = soundnode-git,
conflicts = soundnode-app-bin
options = !strip
source = git+https://github.com/Soundnode/soundnode-app.git
diff --git a/PKGBUILD b/PKGBUILD
index e9450602ab0f..750eab59793d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgdesc="Soundcloud client for the desktop"
arch=('x86_64' 'i686')
url="http://www.soundnodeapp.com/"
license=('GPL3')
-conflicts=('soundnode', 'soundnode-app-bin')
+conflicts=('soundnode-git', 'soundnode-app-bin')
provides=('soundnode')
# Required, otherwise it won't run.