Re: [Qemu-devel] [PATCH] trivial: Restore blank line in qapi-schema

2016-10-21 Thread Markus Armbruster
Eric Blake writes: > Commit de63ab6 accidentally undid part of commit a43edcf, > because the two patches were written in parallel, and the > blank line was not noticed as a casualty of merge conflicts. > > Signed-off-by: Eric Blake Applied to qapi-next, thanks!

[Qemu-devel] [PATCH] trivial: Restore blank line in qapi-schema

2016-10-17 Thread Eric Blake
Commit de63ab6 accidentally undid part of commit a43edcf, because the two patches were written in parallel, and the blank line was not noticed as a casualty of merge conflicts. Signed-off-by: Eric Blake --- qapi-schema.json | 1 + 1 file changed, 1 insertion(+) diff --git a/qapi-schema.json b/q