Hi Chen,

I have raised the patch http://gerrit.ovirt.org/#/c/16364/ to correct the same.

Thanks and Regards,
Shubhendu Tripathi

On 07/03/2013 08:31 AM, Chen, Wei D wrote:
Found confliction in LocalizedEnums.properties, someone may want to take
care of it.

code path:
frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/ui
compat/LocalizedEnums.properties

292 <<<<<<< HEAD
293 VdcActionType___RefreshGlusterHook=Refresh Gluster Hook
294 =======
295 VdcActionType___ManageGlusterService=Manage Service
296 >>>>>>> gluster: bll command to start/stop/restart service

Best Regards,
Dave Chen




_______________________________________________
Engine-devel mailing list
Engine-devel@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-devel