remove conflict with qtchooser

2 files changed, 2 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bf0ed1e52b43..8efafaaa5648 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Thu Dec 31 07:11:56 UTC 2015
+# Thu Dec 31 07:51:36 UTC 2015
 pkgbase = qt5-base-dev-git
 	pkgdesc = A cross-platform application and UI framework
 	pkgver = v5.5.1.106.gc8c4ad0
@@ -33,7 +33,6 @@ pkgbase = qt5-base-dev-git
 	optdepends = libfbclient: Firebird/iBase driver
 	provides = qt5-base
 	conflicts = qt5-base
-	conflicts = qtchooser
 	source = qt5-base::git://code.qt.io/qt/qtbase.git#branch=5.5
 	source = 0001-Add-a-way-to-filter-window-system-events.patch
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index ae55a4ed6c7d..e0419d5026ea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -25,7 +25,7 @@ optdepends=(
 	"libfbclient: Firebird/iBase driver"
 )
 provides=("$_pkgname")
-conflicts=("$_pkgname" "qtchooser")
+conflicts=("$_pkgname")
 source=("$_pkgname::git://code.qt.io/qt/qtbase.git#branch=5.5"
 		"0001-Add-a-way-to-filter-window-system-events.patch")
 sha256sums=('SKIP'