From: Thomas Goirand <thomas@goirand.fr>
Date: Tue, 4 Aug 2015 09:18:56 +0000 (+0000)
Subject: Removed build-conflicts
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=61d85cefc2bdfc2a2ef94122bef892132b2b372b;p=openstack-build%2Fhorizon-build.git

Removed build-conflicts

Rewritten-From: b48652012c076d5257a8c4c38baaddc778f7f7ef
---

diff --git a/trusty/debian/control b/trusty/debian/control
index 987bd83..da03de4 100644
--- 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