[Xen-users] conflict resolution

[Nick Bruton <nick.bruton@xxxxxxxxxxxxx>]

Hi,

I'm new to xen so can someone explain what it wants me to do to resolve 
conflicts after I run the following command .....
/opt/onbld/bin/bfu -p i86xen /archives/osox-bfu-2006-07-14

This is on a Solaris X86 system

Thanks Nick

----------------------------------------------------------------------------
Nick Bruton                                          PADI Divemaster #624215
University of Bristol                                Yamaha YZF R1
Computing Service
Tyndall Avenue
Bristol BS8 1UD
Tel: 0117 9288193

Team email: isys-srct@xxxxxxxxxx

_______________________________________________
Xen-users mailing list
Xen-users@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-users