Code & Deploy
siGit Code
Git Hosting
Toggle menu
Code
Code Review
Models
Repos
Sign in
Sign in
@samitouri
/
QOSamiQemu
QOSamiQemu
/
tests
/
qapi-schema
/
alternate-conflict-dict.json
Code
Commits
Issues
Pulls
Sessions
CI/CD
master
master
json
8 lines
237 Bytes
Copy permalink
Copy
Raw
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'
}
}