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

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

# alternate branches of 'str' type conflict with all scalar types
{ 'alternate': 'Alt',
  'data': { 'one': 'number',
            'two': 'str' } }