Change in ovirt-engine[master]: engine: removed forgotten "<<< HEAD" from the comment

[ofrenkel at redhat.com]

Omer Frenkel has submitted this change and it was merged.

Change subject: engine: removed forgotten "<<< HEAD" from the comment
......................................................................


engine: removed forgotten "<<< HEAD" from the comment

It was a merging mistake, removed

Change-Id: Id826f4d6167b9aa08c3437db1c8b03fc4cfb4180
Signed-off-by: Tomas Jelinek <tjelinek at redhat.com>
---
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
1 file changed, 0 insertions(+), 1 deletion(-)

Approvals:
  Tomas Jelinek: Verified
  Omer Frenkel: Looks good to me, approved



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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id826f4d6167b9aa08c3437db1c8b03fc4cfb4180
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tomas Jelinek <tjelinek at redhat.com>
Gerrit-Reviewer: Gilad Chaplik <gchaplik at redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel at redhat.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek at redhat.com>
Gerrit-Reviewer: automation at ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server