]> Git Repo - qemu.git/blame - tests/qapi-schema/alternate-conflict-string.json
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20170601' into...
[qemu.git] / tests / qapi-schema / alternate-conflict-string.json
CommitLineData
c0644771 1# alternate branches of 'str' type conflict with all scalar types
ab916fad 2{ 'alternate': 'Alt',
3d0c4829 3 'data': { 'one': 'str',
c0644771 4 'two': 'int' } }
This page took 0.143534 seconds and 4 git commands to generate.