Removed explicit conflict with airshipper as it's already implied by the 'provides' array

2 files changed, 3 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 23d67e068874..abfb82eabbda 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = airshipper-git
 	pkgdesc = The official launcher for Veloren - an open-world, open-source multiplayer voxel RPG
-	pkgver = 0.5.0.r0.6b4cb59
+	pkgver = 0.7.0.r0.f4642c9
 	pkgrel = 1
 	url = https://gitlab.com/veloren/airshipper
 	arch = x86_64
@@ -13,7 +13,6 @@ pkgbase = airshipper-git
 	depends = libxcb
 	depends = bzip2
 	provides = airshipper
-	conflicts = airshipper
 	noextract = airshipper.desktop
 	noextract = veloren.png
 	source = airshipper-git::git+https://gitlab.com/veloren/airshipper.git
diff --git a/PKGBUILD b/PKGBUILD
index 4ac3327ed513..0cc8859fcdf7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 export GIT_LFS_SKIP_SMUDGE=1 # This is to prevent Git LFS errors
 pkgname=airshipper-git
-pkgver=0.5.0.r0.6b4cb59
+pkgver=0.7.0.r0.f4642c9
 pkgrel=1
 pkgdesc="The official launcher for Veloren - an open-world, open-source multiplayer voxel RPG"
 arch=('x86_64' 'i686')
@@ -12,7 +12,7 @@ license=('GPL3')
 depends=('openssl' 'libxcb' 'bzip2')
 makedepends=('git' 'rustup' 'git-lfs')
 provides=('airshipper')
-conflicts=('airshipper')
+conflicts=()
 _repo='https://gitlab.com/veloren/airshipper.git'
 source=(
     "$pkgname"::"git+$_repo"