From: Thomas Goirand <thomas@goirand.fr>
Date: Wed, 13 Aug 2014 14:44:57 +0000 (+0800)
Subject: Added Build-Conflicts: python-unittest2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=74a754f08a6284aa3315e7ad4cda85895e6d60ee;p=openstack-build%2Fhorizon-build.git

Added Build-Conflicts: python-unittest2

Rewritten-From: 2075f6562e33384be3a72d1fe220b8b342fa5020
---

diff --git a/trusty/debian/control b/trusty/debian/control
index f6eac60..625600e 100644
--- 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