Added Build-Conflicts: python-unittest2

Rewritten-From: 2075f6562e33384be3a72d1fe220b8b342fa5020

diff --git a/trusty/debian/control b/trusty/debian/control
index f6eac6099300227c25767b4b764e5382988bd73b..625600e2e10438da286758986212909db10dc96e 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -52,6 +52,7 @@ Build-Depends-Indep: python-ceilometerclient (>= 1.0.6),
                      python-xstatic,
                      python-xstatic-jquery,
                      python-xvfbwrapper
+Build-Conflicts: python-unittest2
 Standards-Version: 3.9.5
 Homepage: http://horizon.openstack.org
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/horizon.git;a=summary