Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

[qemu/ar7.git] / tests / qapi-schema / alternate-conflict-dict.json

# alternate branches of object type conflict with each other
{ 'struct': 'One',
  'data': { 'name': 'str' } }
{ 'struct': 'Two',
  'data': { 'value': 'int' } }
{ 'alternate': 'Alt',
  'data': { 'one': 'One',
            'two': 'Two' } }