tree 641385118737469ba73f14830dab5826230378be
parent a944a4b0a0c40bce3b29f691b036531623ff82b8
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>