[SCM] audacity/master: Remove Build-Conflicts

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b68ea554ea4b4d4cf6bb813195d62e6fdb5b4e0a
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Fri Jan 29 19:27:47 2016 +0100

    Remove Build-Conflicts
    
    libwxbase2.6-dev and wx2.6-headers are only available in oldoldstable.

diff --git a/debian/control b/debian/control
index e8ae043..cf69f3e 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,6 @@ Build-Depends: autoconf,
                lv2-dev,
                portaudio19-dev (>= 19+svn20101113-3~),
                vamp-plugin-sdk (>= 2.0)
-Build-Conflicts: libwxbase2.6-dev, wx2.6-headers
 Homepage: http://audacityteam.org/
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/audacity.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/audacity.git

-- 
Audacity debian packaging