repo.or.cz
/
qemu
/
kevin.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
history
|
raw
|
HEAD
usb-host: wire up timer for windows
[qemu/kevin.git]
/
tests
/
qapi-schema
/
alternate-conflict-dict.json
blob
3d7881279c733abc4c96737395dd6efc862a319b
1
# alternate branches of object type conflict with each other
2
{ 'struct': 'One',
3
'data': { 'name': 'str' } }
4
{ 'struct': 'Two',
5
'data': { 'value': 'int' } }
6
{ 'alternate': 'Alt',
7
'data': { 'one': 'One',
8
'two': 'Two' } }