Am 13.10.2015 um 15:18 schrieb Pavel Fedin: >> diff --git a/include/qom/object.h b/include/qom/object.h >> index 2a54515..38f41d3 100644 >> --- a/include/qom/object.h >> +++ b/include/qom/object.h [...] >> @@ -964,8 +975,14 @@ typedef struct ObjectPropertyIterator >> ObjectPropertyIterator; >> * object_property_iter_init: >> * @obj: the object >> * >> +<<<<<<< HEAD >> * Initializes an iterator for traversing all properties >> * registered against an object instance. >> +======= >> + * Iterates over all properties defined against the object >> + * instance, its class and all parent classes, calling >> + * @iter for each property. >> +>>>>>>> 0ca9307... qom: allow properties to be registered against classes > > Conflict markers slipped in the comment
There is no v5 fixing this yet? If agreement has been reached, I would at least start applying from the front, to avoid another lengthy review cycle; I could try to resolve the conflict myself if it's the only nit. Regards, Andreas P.S. Pavel, please delete unneeded quotation from your reply, I only found that one line of inline comment. -- SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Felix Imendörffer, Jane Smithard, Graham Norton; HRB 21284 (AG Nürnberg)
