Skip to content

Commit c1fade8

Browse files
committed
Resolve merge conflits
2 parents 204fd69 + 6a38c35 commit c1fade8

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

CMakePresets.json

+1
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,4 @@
3333
}
3434
]
3535
}
36+

main.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ int main() {
1111
JSStringRelease(string);
1212
return 0;
1313
}
14+

0 commit comments

Comments
 (0)