fixex merge conflicts

2018-06-08 19:50:36 +02:00 · 2018-06-08 19:50:36 +02:00 · 8e9551b1c7
commit 8e9551b1c7
parent 8ba7e7d807 f99acdb075
53 changed files with 2648 additions and 355 deletions
--- a/compiler/options.nim
+++ b/compiler/options.nim
@ -118,7 +118,8 @@ type
    callOperator,
    parallel,
    destructor,
-    notnil
+    notnil,
+    oldIterTransf

  SymbolFilesOption* = enum
    disabledSf, writeOnlySf, readOnlySf, v2Sf