forked from LeenkxTeam/Kmake
37 lines
394 B
JSON
37 lines
394 B
JSON
{
|
|
"array": [
|
|
<<<<<<< HEAD
|
|
100,
|
|
{
|
|
"foo": "baz"
|
|
},
|
|
||||||| merged common ancestors
|
|
1,
|
|
=======
|
|
111,
|
|
1,
|
|
2,
|
|
3,
|
|
{
|
|
"foo": "bar"
|
|
},
|
|
>>>>>>> a
|
|
1
|
|
],
|
|
"a": {
|
|
"b": {
|
|
<<<<<<< HEAD
|
|
"c": {
|
|
"x": "bbbb"
|
|
}
|
|
||||||| merged common ancestors
|
|
"c": {
|
|
"x": "aaaa"
|
|
}
|
|
=======
|
|
"c": "xxxx"
|
|
>>>>>>> a
|
|
}
|
|
}
|
|
}
|