From: Greg Price <price@mit.edu>
Date: Sun, 28 Sep 2008 21:22:00 +0000 (-0400)
Subject: fold duplicate Conflicts: lines, to make newer debuild happy
X-Git-Tag: sipb-xen-autoinstaller/2.5~6
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-autoinstaller.git/commitdiff_plain/381f3957e8341a6b5d3c523a83a8dcbe9d36fcc8?ds=sidebyside;hp=381f3957e8341a6b5d3c523a83a8dcbe9d36fcc8

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
---