This repository was archived by the owner on Nov 3, 2021. It is now read-only.
This repository was archived by the owner on Nov 3, 2021. It is now read-only.
Merge conflicts with spec master #57
Description
There are merge conflicts between this repo and the spec master branch:
CONFLICT (content): Merge conflict in test/core/select.wast
CONFLICT (content): Merge conflict in test/core/linking.wast
CONFLICT (content): Merge conflict in test/core/imports.wast
CONFLICT (content): Merge conflict in test/core/globals.wast
CONFLICT (content): Merge conflict in test/core/exports.wast
CONFLICT (content): Merge conflict in test/core/br_table.wast
CONFLICT (content): Merge conflict in test/core/binary.wast
CONFLICT (content): Merge conflict in interpreter/valid/valid.ml
CONFLICT (content): Merge conflict in interpreter/text/parser.mly
CONFLICT (content): Merge conflict in interpreter/text/lexer.mll
CONFLICT (content): Merge conflict in interpreter/text/arrange.ml
CONFLICT (content): Merge conflict in interpreter/syntax/types.ml
CONFLICT (content): Merge conflict in interpreter/syntax/operators.ml
CONFLICT (content): Merge conflict in interpreter/syntax/ast.ml
CONFLICT (content): Merge conflict in interpreter/script/js.ml
CONFLICT (content): Merge conflict in interpreter/runtime/memory.mli
CONFLICT (content): Merge conflict in interpreter/runtime/memory.ml
CONFLICT (content): Merge conflict in interpreter/exec/eval_numeric.ml
CONFLICT (content): Merge conflict in interpreter/exec/eval.ml
CONFLICT (content): Merge conflict in interpreter/binary/encode.ml
CONFLICT (content): Merge conflict in interpreter/binary/decode.ml
CONFLICT (content): Merge conflict in interpreter/README.md
This prevents the testsuite mirror's update script from updating the reference-types tests.