Change in ovirt-engine[master]: core: Remove merge conflicts

[amureini at redhat.com]

Allon Mureinik has submitted this change and it was merged.

Change subject: core: Remove merge conflicts
......................................................................


core: Remove merge conflicts

Remove conflicts introduced by 849bc154945f0f2ee8bb6b62f5b9de6fef02436d

Change-Id: Id84b1f2efefe6d02bd849a6365e66b511d387f19
Signed-off-by: Allon Mureinik <amureini at redhat.com>
---
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
1 file changed, 0 insertions(+), 3 deletions(-)

Approvals:
  Allon Mureinik: Verified; Looks good to me, approved


-- 
To view, visit http://gerrit.ovirt.org/17008
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id84b1f2efefe6d02bd849a6365e66b511d387f19
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amureini at redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini at redhat.com>
Gerrit-Reviewer: Gilad Chaplik <gchaplik at redhat.com>