Update

2026-05-21 23:40:20 -07:00
parent 3e2915dff7
commit 877a69d844
5737 changed files with 29796 additions and 1589684 deletions
--- a/Kha/Tools/windows_x64/std/eval/integers/UInt64.hx
+++ b/Kha/Tools/windows_x64/std/eval/integers/UInt64.hx
@ -18,10 +18,6 @@ package eval.integers;

 	/**
 		Parse the given string value to an unsigned integer.
-<<<<<<< HEAD
-
-=======
->>>>>>> development
 		Throws if the given string is not a valid representation of an unsigned
 		integer.
 	**/