Dante/Kmake
1
0
Fork 0
forked from LeenkxTeam/Kmake
Code Pull Requests Activity

Upload Kmake

Browse Source
This commit is contained in:
Gorochu
2026-05-26 23:36:42 -07:00
parent ba051b2f74
commit 555ec72358
41615 changed files with 13344630 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
deps/npm/test/fixtures/merge-conflict.json vendored Normal file
View File

@ -0,0 +1,36 @@
{
"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
}
}
}