summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>2007-09-05 16:54:54 +0000
committerjcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>2007-09-05 16:54:54 +0000
commitc40929faf2ef4dc93be9df246b1370cea3849d45 (patch)
tree74a8a59ba33d6857780b14a862624b50465eafb6
parentb644e266dd6f5f4b6cdac126477b61debee89e26 (diff)
Fix erroneous entry in control file.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6315 221aa14e-8319-0410-a670-987f0aec2ac5
-rw-r--r--debian/control1
1 files changed, 0 insertions, 1 deletions
diff --git a/debian/control b/debian/control
index a38fcd3f97..160b841030 100644
--- a/debian/control
+++ b/debian/control
@@ -186,7 +186,6 @@ Description: Software Defined Radio
Package: python-usrp
Architecture: any
Depends: ${python:Depends}, libusrp0c2a
-Conflicts: python-gnuradio
Provides: ${python:Provides}
Section: python
XB-Python-Version: ${python:Versions}