Allon Mureinik has uploaded a new change for review. Change subject: core: Remove merge conflicts ......................................................................
core: Remove merge conflicts Remove conflicts introduced by 849bc154945f0f2ee8bb6b62f5b9de6fef02436d Change-Id: Id84b1f2efefe6d02bd849a6365e66b511d387f19 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/08/17008/1 diff --git a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties index 02d1f12..31401fc 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -244,11 +244,8 @@ VAR__TYPE__PERMISSION=$type Permission VAR__TYPE__HOST_CAPABILITIES=$type Host capabilities VAR__TYPE__NETWORK_QOS=$type Network QoS -<<<<<<< HEAD VAR__TYPE__SPM=$type SPM -======= VAR__TYPE__CLUSTER_POLICY=$type Cluster Policy ->>>>>>> engine: cluster policy commands and queries VAR__ACTION__RUN=$action run VAR__ACTION__REMOVE=$action remove VAR__ACTION__ADD=$action add -- To view, visit http://gerrit.ovirt.org/17008 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id84b1f2efefe6d02bd849a6365e66b511d387f19 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
