Merge remote-tracking branch 'remotes/jnsnow/tags/bitmaps-pull-request' into staging
[qemu/ar7.git] / tests / qapi-schema / alternate-conflict-dict.err
blobe5b42d04c95a53f29431eda1aa9aab8d931d3ce3
1 tests/qapi-schema/alternate-conflict-dict.json: In alternate 'Alt':
2 tests/qapi-schema/alternate-conflict-dict.json:6: branch 'two' can't be distinguished from 'one'