| commit | 934717103b0066d6f53cdca0abac36634740fe56 | [log] [tgz] |
|---|---|---|
| author | Andrew Geissler <andrewg@us.ibm.com> | Mon Jan 23 13:43:49 2017 -0600 |
| committer | Andrew Geissler <andrewg@us.ibm.com> | Wed Jan 25 10:15:36 2017 -0600 |
| tree | 641385118737469ba73f14830dab5826230378be | |
| parent | a944a4b0a0c40bce3b29f691b036531623ff82b8 [diff] |
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>