Remove conflict with qgroundcontrol-git

1 files changed, 1 insertions, 2 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 5e4b694f3988..195009a7ba1a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,11 @@
 # Maintainer: Anselmo L. S. Melo <anselmo.melo@intel.com>
 pkgname=qgroundcontrol
 pkgver=2.9.7b
-pkgrel=1
+pkgrel=2
 pkgdesc="Micro air vehicle ground control station."
 arch=('any')
 url="http://qgroundcontrol.org/"
 license=('GPL3')
-conflicts=('qgroundcontrol-git')
 depends=(\
   'espeak'  # optional but you have to decide if you want it at built-time\
   'qt5-svg' 'qt5-graphicaleffects' 'qt5-webkit' 'phonon-qt4' 'qt5-serialport'\