Skip to content
Commit 4a631e4f authored by Andrew Geissler's avatar Andrew Geissler
Browse files

Put Conflicts in correct location for op-stop-host 



Resolves openbmc/openbmc#1002

Change-Id: Iab57b81f3e65572d09aa126ef4be37460ff9d984
Signed-off-by: default avatarAndrew Geissler <andrewg@us.ibm.com>
parent 2a0cb54f
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment