[SCM] audacity/master: Undo wrap-and-sort -a

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1b5d52f1857d24263e46e025609a351a5990e284
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Thu Jan 21 21:41:35 2016 +0100

    Undo wrap-and-sort -a

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

-- 
Audacity debian packaging