diff --git a/README.md b/README.md index 533de6d..878c2c8 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,7 @@ View help via ``` ?`?` ```. ``` Atomic Bunch Lang Other -------------------------------- +<<<<<<< HEAD atm rec lng na lgl lst sym nan int dfr exp nil @@ -59,6 +60,16 @@ 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 +num vec call fin +chr mtx name inf +raw arr fun ord +cmp fct env prim +dbl fml tab +>>>>>>> f09ae7b (type table spaces) ``` `ask`: