[Engine-devel] conflict detected in LocalizedEnums.properties

[Chen, Wei D]

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

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 6077 bytes
Desc: not available
URL: <http://lists.ovirt.org/pipermail/engine-devel/attachments/20130703/7889d75f/attachment.p7s>