Explorar o código

[doc] remove git merge strings (#10134)

George Corney %!s(int64=4) %!d(string=hai) anos
pai
achega
4a0a911c2d
Modificáronse 1 ficheiros con 0 adicións e 4 borrados
  1. 0 4
      std/eval/integers/UInt64.hx

+ 0 - 4
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.
 	**/