upgpkg: polymc-git 1.1.1.r209.g4ff1306e-1

fix: remove multimc from conflicts

2 files changed, 3 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7a4c42dc0127..96d389a8ffea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = polymc-git
 	pkgdesc = Minecraft launcher with ability to manage multiple instances.
-	pkgver = 1.1.0.r144.gd5576779
+	pkgver = 1.1.1.r209.g4ff1306e
 	pkgrel = 1
 	url = https://github.com/PolyMC/PolyMC
 	arch = i686
@@ -22,7 +22,6 @@ pkgbase = polymc-git
 	optdepends = xorg-xrandr: for older minecraft versions
 	provides = polymc
 	conflicts = polymc
-	conflicts = multimc
 	source = git+https://github.com/PolyMC/PolyMC
 	source = git+https://github.com/MultiMC/libnbtplusplus
 	source = git+https://github.com/stachenov/quazip
diff --git a/PKGBUILD b/PKGBUILD
index c23ffb27d60b..de0b1a28e0d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 _pkgname=polymc
 pkgname=${_pkgname}-git
-pkgver=1.1.0.r144.gd5576779
+pkgver=1.1.1.r209.g4ff1306e
 pkgrel=1
 pkgdesc="Minecraft launcher with ability to manage multiple instances."
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ url="https://github.com/PolyMC/PolyMC"
 license=('GPL3')
 depends=('java-runtime' 'libgl' 'qt5-base' 'qt5-svg' 'qt5-imageformats' 'zlib' 'hicolor-icon-theme')
 provides=('polymc')
-conflicts=('polymc' 'multimc')
+conflicts=('polymc')
 makedepends=('cmake' 'git' 'java-environment')
 optdepends=('glfw: to use system GLFW libraries'
             'openal: to use system OpenAL libraries'