Merge branch 'references-simd' of github.com:SPY/haskell-wasm into references-simd

2023-08-21 21:22:20 -06:00
parent 9eadc50ee3 f2f5fcc56f
commit a3de890895
1 changed files with 4 additions and 0 deletions
@@ -1,6 +1,10 @@
 cabal-version:  2.2
 name:           wasm
+<<<<<<< HEAD
 version:        1.1.2
+=======
+version:        1.1.1
+>>>>>>> f2f5fcc56ff7bb3d0a8ce47db14ce85f633a0150
 synopsis:       WebAssembly Language Toolkit and Interpreter
 description:
  Library for parsing and interpreting WebAssembly, including: