Remove extra stuff

2025-10-30 17:15:43 +11:00
parent 976e9dfaa0
commit 5e9c2273a9
3 changed files with 5 additions and 11 deletions
--- a/tests/create.basm
+++ b/tests/create.basm
@@ -1,11 +1,5 @@
 string str1 13 "Hello, world!"
-<<<<<<< HEAD
 string str2 -1 "Testing dynamic string!"
 int var -1
 inc var
-inc var
-=======
-int var 100000
-inc str1
-print var
->>>>>>> 89065711cea711879e4f0bfc53b3da3974590b8c
+inc var