fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2024-12-04 18:10:18 +00:00
Code Issues Projects Releases Wiki Activity

Use union merge on the changelog file.

Browse Source 
This keeps both sides of a conflict. It's essentially the same as removing the
conflict markers.
This commit is contained in:
Nick Lewycky 2019-09-13 14:03:22 -07:00
parent ec94d366b0
commit d6e3138a3d
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -1,2 +1,3 @@
lib/emscripten/emtests/* linguist-vendored lib/emscripten/emtests/* linguist-vendored
lib/spectests/spectests/* linguist-vendored lib/spectests/spectests/* linguist-vendored
CHANGELOG.md merge=union