On Thu, Nov 10, 2016 at 10:55:17 -0500, John Ferlan wrote:
> Commit id '74bbb8c2ec' seems to have mismerged a bit - adding 240 comments
> out of place. Just clean that up.
>
> Signed-off-by: John Ferlan
> ---
>
> Pushed as trivial
Oops. I had a merge conflict in 5
Commit id '74bbb8c2ec' seems to have mismerged a bit - adding 240 comments
out of place. Just clean that up.
Signed-off-by: John Ferlan
---
Pushed as trivial
src/qemu/qemu_capabilities.c | 3 +--
src/qemu/qemu_capabilities.h | 2 --
2 files changed, 1 insertion(+), 4