merge artifact

SPY · Aug 22, 2023 · 7fab539 · 7fab539
1 parent a3de890
commit 7fab539
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/wasm.cabal b/wasm.cabal
@@ -1,10 +1,6 @@
 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: