fixed merge conflict

kvark-lang · Nov 22, 2022 · b2e8694 · b2e8694
2 parents 0005473 + 5ce7206
commit b2e8694
Show file tree

Hide file tree

Showing 2 changed files with 187 additions and 185 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # jasm - javascript-y assembler
 
-This is still very new!
-It can only do 32 bit, Intel style at the moment.
+This is still very new! It can only do 32 bit, Intel style at the moment.
 
 ## docs
+
 For now - [deno.land](https://deno.land/x/jasm@0.0.1a/mod.ts)