tree 1af915aa8605c4c9aa0d62e184f6a753beda8dca
parent 2a0cb54f5d215c25e608458bc030b5a75ab509ae
author Andrew Geissler <andrewg@us.ibm.com> 1485200629 -0600
committer Andrew Geissler <andrewg@us.ibm.com> 1485360936 -0600

Put Conflicts in correct location for op-stop-host

Resolves openbmc/openbmc#1002

Change-Id: Iab57b81f3e65572d09aa126ef4be37460ff9d984
Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>