summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 0 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0ea74b10bc3c..fc2a5c024d7f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -17,7 +17,6 @@ pkgbase = easyrpg-player
depends = openal
depends = libsndfile
depends = expat
- conflicts = easyrpg-player-git
source = easyrpg-readers-0.1.2.tar.gz::https://github.com/EasyRPG/Readers/archive/0.1.2.tar.gz
source = easyrpg-player-0.1.2.tar.gz::https://github.com/EasyRPG/Player/archive/0.1.2.tar.gz
sha256sums = 694c1b55c4a575ebc602e4f18736cda0ec187205f14545dc5641408427bd0d49
diff --git a/PKGBUILD b/PKGBUILD
index 4562bb11fee5..4bbdaa732df2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,6 @@ pkgdesc="EasyRPG Player aims to be a free, RPG Maker 2000/2003 interpreter"
arch=('i686' 'x86_64')
url="https://easy-rpg.org/"
license=('GPL3')
-conflicts=('easyrpg-player-git')
makedepends=('boost' 'git')
depends=('sdl_mixer' 'freetype2' 'pixman' 'libpng' 'libjpeg' 'openal' 'libsndfile' 'expat')
install=$pkgname.install