summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Gauduin2017-05-25 14:03:24 +0200
committerMaxime Gauduin2017-05-25 14:03:24 +0200
commitc10148eba36cc2ec2e47ac542446f1ea61be769d (patch)
tree10897517f9d5dfad27941eb5618008e54f9dc101
parentb8d49273711b91db40dc84821aed2f1971846fd4 (diff)
downloadaur-c10148eba36cc2ec2e47ac542446f1ea61be769d.tar.gz
Fix conflicts
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD2
2 files changed, 3 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index be7630389cc8..465afd18291e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Thu May 25 11:54:12 UTC 2017
+# Thu May 25 12:03:24 UTC 2017
pkgbase = libretro-shaders-slang-git
pkgdesc = Collection of Vulkan shaders for libretro
pkgver = r370.b91c670
@@ -11,7 +11,7 @@ pkgbase = libretro-shaders-slang-git
makedepends = git
provides = libretro-shaders
provides = libretro-shaders-slang
- conflicts = libretro-shaders-slang
+ conflicts = libretro-shaders
conflicts = libretro-shaders-slang
source = libretro-shaders-slang::git+https://github.com/libretro/slang-shaders.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 2087e7519c78..43376f44343d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ url='http://www.libretro.com/'
license=('GPL3')
groups=('libretro')
provides=('libretro-shaders' 'libretro-shaders-slang')
-conflicts=('libretro-shaders-slang' 'libretro-shaders-slang')
+conflicts=('libretro-shaders' 'libretro-shaders-slang')
makedepends=('git')
source=('libretro-shaders-slang::git+https://github.com/libretro/slang-shaders.git')
sha256sums=('SKIP')