[SCM] obs-studio/master: Remove Build-Conflicts

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6be183ba1b0e9dc5bf4fd26d31c68ef240384238
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Thu Jun 29 21:02:30 2017 +0200

    Remove Build-Conflicts

diff --git a/debian/control b/debian/control
index 3e9794d..e36f07e 100644
--- a/debian/control
+++ b/debian/control
@@ -37,9 +37,6 @@ Build-Depends:
  libvlc-dev,
  qtbase5-dev,
  python-docutils (>= 0.6)
-Build-Conflicts:
- libqt5x11extras5-dev (>= 5.8),
- qtbase5-dev (>= 5.8)
 Standards-Version: 3.9.8
 Homepage: https://obsproject.com
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/obs-studio.git

-- 
obs-studio packaging