New code

uxnt-naxe · May 31, 2024 · 114d903 · 114d903
1 parent b677f9b
commit 114d903
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/otne.exe b/otne.exe
diff --git a/resources/code/HelloWorld.otne b/resources/code/HelloWorld.otne
@@ -1,13 +1,11 @@
-<<<<<<< HEAD
 // "module"."module".rrr
 
 zh > test = "qwe" ; ~
-=======
+
 // hello world!
 // module
 import stdio;
 // func
 func main () {
     printf("hello world!");
-}
->>>>>>> 9fc9235449293040764df7d8703ea75317defeb1
+}