summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPopolon2021-09-18 13:50:51 +0200
committerPopolon2021-09-18 13:50:51 +0200
commit2fe04c45b630b9874b6fc05ea1cc6b13baabdbbb (patch)
tree382e675d5f4b020dc01887c6eda6cd813d09017e
parent8599974cf7a66d0c0cf1e35f676336d30c4f6a72 (diff)
downloadaur-2fe04c45b630b9874b6fc05ea1cc6b13baabdbbb.tar.gz
forgot to change conflit from 'pixelorama-git' to 'pixelorama'
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 580e67efa177..d7cbca7b417c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -25,7 +25,7 @@ pkgbase = pixelorama-git
depends = libxrandr
provides = pixelorama
conflicts = pixelorama-bin
- conflicts = pixelorama-git
+ conflicts = pixelorama
source = pixelorama::git+https://github.com/Orama-Interactive/Pixelorama.git
sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 0f48eeecc7bc..3ee197f0b735 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@ license=('MIT')
depends=('alsa-lib' 'hicolor-icon-theme' 'libglvnd' 'libpulse' 'libxcursor' 'libxi' 'libxinerama' 'libxrandr')
makedepends=('curl' 'godot' 'unzip' 'xorg-server-xvfb')
provides=('pixelorama')
-conflicts=('pixelorama-bin' 'pixelorama-git')
+conflicts=('pixelorama-bin' 'pixelorama')
source=("${_pkgname}::git+${_url}.git")
sha512sums=(SKIP)