Gendesk broke opsu-git

They're now conflicting each other

2 files changed, 6 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 547a03d0c747..3c564c3023c1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Sun Jan 31 13:19:21 UTC 2016
 pkgbase = opsu
 	pkgdesc = An open source osu!-client written in Java.
 	pkgver = 0.12.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://itdelatrisu.github.io/opsu/
 	changelog = .CHANGELOG
 	arch = any
@@ -14,7 +16,7 @@ pkgbase = opsu
 	depends = java-runtime
 	depends = bash
 	provides = opsu
-	conflicts = opsu
+	conflicts = opsu-git
 	source = opsu::git://github.com/itdelatrisu/opsu.git#tag=0.12.1
 	source = opsu.sh
 	sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index b49f08d4c497..0025eb807dc8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=opsu
 pkgver=0.12.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An open source osu!-client written in Java."
 arch=('any')
 url="https://itdelatrisu.github.io/opsu/"
@@ -11,7 +11,7 @@ changelog=.CHANGELOG
 depends=('java-runtime' 'bash')
 makedepends=('java-environment' 'java-web-start' 'gradle' 'gendesk' 'git')
 provides=('opsu')
-conflicts=('opsu')
+conflicts=('opsu-git')
 source=( ${pkgname}::git://github.com/itdelatrisu/opsu.git#tag=${pkgver}
          opsu.sh )
 sha512sums=('SKIP'