Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging
[qemu.git] / tests / qapi-schema / alternate-conflict-string.json
1 # alternate branches of 'str' type conflict with all scalar types
2 { 'alternate': 'Alt',
3   'data': { 'one': 'str',
4             'two': 'int' } }