fold duplicate Conflicts: lines, to make newer debuild happy
authorGreg Price <price@mit.edu>
Sun, 28 Sep 2008 21:22:00 +0000 (17:22 -0400)
committerGreg Price <price@mit.edu>
Sun, 28 Sep 2008 21:22:00 +0000 (17:22 -0400)
commit381f3957e8341a6b5d3c523a83a8dcbe9d36fcc8
tree5c9921b0b6809515cb6d31e5a06f966fe5ca6ea3
parent0d0b6587c5d55462ed4fcae062e492f1cd8cf594
fold duplicate Conflicts: lines, to make newer debuild happy

Also remove a false Conflicts in -host, that I got by copy-pasting.

svn path=/trunk/packages/sipb-xen-autoinstaller/; revision=932
debian/control
debian/control.in