resolved conflict for news.txt

2012-04-21 03:22:53 +02:00 · 2012-04-21 03:22:53 +02:00 · 7511a05b27
commit 7511a05b27
parent 4aba7421f5 a05f0aa6b5
9 changed files with 244 additions and 204 deletions
--- a/tests/run/tenumitems.nim
+++ b/tests/run/tenumitems.nim
@ -5,7 +5,7 @@ discard """
 type TAlphabet = enum
  A, B, C

-iterator items(E: typedesc): E =
+iterator items(E: typedesc{enum}): E =
  for v in low(E)..high(E):
    yield v