Re: [Engine-devel] conflict detected in LocalizedEnums.properties

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(a)ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-devel