[SCM] vlc/master: Drop Build-Conflicts

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3c105d846dab5ae51644defdb9cc543ee23653bd
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Jun 18 16:52:47 2017 +0200

    Drop Build-Conflicts

diff --git a/debian/control b/debian/control
index b39894c..b29ba5a 100644
--- a/debian/control
+++ b/debian/control
@@ -131,8 +131,6 @@ Build-Depends: autopoint,
                libwebp-dev,
                libxvidcore-dev,
                yasm
-Build-Conflicts: libqt5x11extras5-dev (>= 5.8),
-                 qtbase5-dev (>= 5.8)
 Standards-Version: 3.9.8
 Homepage: https://www.videolan.org/vlc/
 Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/vlc.git

-- 
VLC media player packaging