Clean up stray conflict markers.
[invirt/packages/xvm-prodconfig.git] / debian / control
2008-10-28  Evan Brodersipb-xen-base -> invirt-base in dependency lists 0.17.5
2008-09-28  Greg Priceconfig packages depend on sipb-xen-base
2008-08-22  Sam HartmanAdd initial prodconfig 0.1