resolved system.nim conflicts

5 files changed, 11 insertions, 11 deletions

diff --git a/tests/accept/compile/techo.nim b/tests/accept/compile/techo.nim
index beb21fa16..0fa4b5fe0 100755
--- a/tests/accept/compile/techo.nim
+++ b/tests/accept/compile/techo.nim
@@ -1,3 +1,3 @@
 # Simplest Nimrod program
 
-echo "Hallo, World!"
+echo "Hello, World!"
diff --git a/tests/accept/compile/thallo.nim b/tests/accept/compile/thallo.nim
index f1cae5897..8cbe10bd5 100755
--- a/tests/accept/compile/thallo.nim
+++ b/tests/accept/compile/thallo.nim
@@ -36,7 +36,7 @@ macrotest(stdout)
 #GC_disable()
 
 echo("This was compiled by Nimrod version " & system.nimrodVersion)
-writeln(stdout, "Hallo", " World", "!")
+writeln(stdout, "Hello", " World", "!")
 
 echo(["a", "b", "c", "d"].len)
 for x in items(["What's", "your", "name", "?", ]):
@@ -51,7 +51,7 @@ var testseq: seq[string] = @[
 ]
 echo(repr(testseq))
 
-var dummy = "hallo"
+var dummy = "hello"
 echo(copy(dummy, 2, 3))
 
 echo($meC)
@@ -60,11 +60,11 @@ echo($meC)
 for x, y in items([(1, 2), (3, 4), (6, 1), (5, 2)]):
   echo x
   echo y
-  
+
 proc simpleConst(): int = return 34
-  
-# test constant evaluation: 
-const  
+
+# test constant evaluation:
+const
   constEval3 = simpleConst()
   constEval = "abc".contains('b')
   constEval2 = fac(7)
diff --git a/tests/accept/compile/tio.nim b/tests/accept/compile/tio.nim
index 014c32d9f..5ae119f77 100755
--- a/tests/accept/compile/tio.nim
+++ b/tests/accept/compile/tio.nim
@@ -1,7 +1,7 @@
 # test the file-IO

 

 proc main() =

-  for line in lines("thallo.nim"):

+  for line in lines("thello.nim"):

     writeln(stdout, line)

 

 main()

diff --git a/tests/accept/compile/tloops.nim b/tests/accept/compile/tloops.nim
index 3d03256ad..74a3992c9 100755
--- a/tests/accept/compile/tloops.nim
+++ b/tests/accept/compile/tloops.nim
@@ -57,7 +57,7 @@ proc Foo(n: int): int =
     while b:

         a = a + 3

     a = a + 5

-    write(stdout, "Hallo!")

+    write(stdout, "Hello!")

 

 

 # We should come till here :-)

diff --git a/tests/accept/compile/tstreams.nim b/tests/accept/compile/tstreams.nim
index 68ca8eeeb..640565a27 100755
--- a/tests/accept/compile/tstreams.nim
+++ b/tests/accept/compile/tstreams.nim
@@ -2,6 +2,6 @@ import streams
 
 var outp = newFileStream(stdout)
 var inp = newFileStream(stdin)
-write(outp, "Hallo! What is your name?")
+write(outp, "Hello! What is your name?")
 var line = readLine(inp)
-write(outp, "nice name: " & line)
+write(outp, "Nice name: " & line)