[python-debian/master] Merge two Conflicts lines into one

[John Wright]

I goofed this up in commit 7e62dda78541fb310e19ef904981a0c46ea3ac9d.
---
 debian/control |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 521b588..f1ddbdf 100644
--- a/debian/control
+++ b/debian/control
@@ -18,10 +18,9 @@ Package: python-debian
 Architecture: all
 Depends: ${python:Depends}
 Recommends: python-apt
-Conflicts: python-apt (< 0.7.11.1)
 Suggests: gpgv
 Provides: python-deb822
-Conflicts: python-deb822
+Conflicts: python-deb822, python-apt (< 0.7.11.1)
 Replaces: python-deb822
 Description: Python modules to work with Debian-related data formats
  This package provides Python modules that abstract many formats of Debian 
-- 
1.5.6.5