Removed build-conflicts

Rewritten-From: b48652012c076d5257a8c4c38baaddc778f7f7ef

diff --git a/trusty/debian/control b/trusty/debian/control
index 987bd83a307c545c2a6d9732cf0c3ff055fbcc3e..da03de458e4ebe5147531af4c7f101349a942d24 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -80,8 +80,6 @@ Build-Depends-Indep: gettext,
                      python-xstatic-term.js,
                      python-xvfbwrapper,
                      python-yaml,
-Build-Conflicts: python-rednose,
-                 python-unittest2,
 Standards-Version: 3.9.6
 Homepage: http://horizon.openstack.org
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/horizon.git;a=summary