mirror of
https://github.com/fluencelabs/wasmer
synced 2024-12-04 10:00:18 +00:00
d6e3138a3d
This keeps both sides of a conflict. It's essentially the same as removing the conflict markers.
4 lines
112 B
Plaintext
4 lines
112 B
Plaintext
lib/emscripten/emtests/* linguist-vendored
|
|
lib/spectests/spectests/* linguist-vendored
|
|
CHANGELOG.md merge=union
|