[node-patches] Change in ovirt-node[master]: remove edit-node duplicate code from failed merge when synci...

[mburns at redhat.com]

Michael Burns has submitted this change and it was merged.

Change subject: remove edit-node duplicate code from failed merge when syncing master branch
......................................................................


remove edit-node duplicate code from failed merge when syncing master branch

Change-Id: I7538335626eb262ecc9be37f1b7e5ebd76564443
Signed-off-by: Joey Boggs <jboggs at redhat.com>
---
M tools/edit-node
1 file changed, 0 insertions(+), 67 deletions(-)

Approvals:
  Michael Burns: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7538335626eb262ecc9be37f1b7e5ebd76564443
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Joey Boggs <jboggs at redhat.com>
Gerrit-Reviewer: Joey Boggs <jboggs at redhat.com>
Gerrit-Reviewer: Michael Burns <mburns at redhat.com>