type table space

D-Se · Dec 1, 2023 · 90e15a9 · 90e15a9
1 parent 6268fa9
commit 90e15a9
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -51,16 +51,6 @@ View help via ``` ?`?` ```.
 ```
 Atomic	Bunch	Lang	Other
 --------------------------------
-<<<<<<< HEAD
-atm	  rec	    lng	    na
-lgl  	lst	    sym	    nan
-int  	dfr	    exp	    nil
-num  	vec	    call    fin
-chr  	mtx	    name    inf
-raw  	arr	    fun	    ord
-cmp  	fct	    env	    prim
-dbl	 	fml	    tab
-=======
 atm	    rec	    lng	    na
 lgl	    lst	    sym	    nan
 int	    dfr	    exp	    nil
@@ -69,7 +59,6 @@ chr	    mtx	    name    inf
 raw	    arr	    fun	    ord
 cmp	    fct	    env	    prim
 dbl	    fml	    tab	    
->>>>>>> f09ae7b (type table spaces)
 ```
 
 `ask`: