diff options
author | Araq <rumpf_a@web.de> | 2018-06-08 19:50:36 +0200 |
---|---|---|
committer | Araq <rumpf_a@web.de> | 2018-06-08 19:50:36 +0200 |
commit | 8e9551b1c7614029f12e7d62ba81f367d1aaf6bd (patch) | |
tree | 6aaa97a9734784ab5a65d1d2975100e4dd9872d1 /compiler/options.nim | |
parent | 8ba7e7d807c37a0988abd69ef9824b4822fe04f3 (diff) | |
parent | f99acdb07584d2c4c5eb1f22d998d97bcd823357 (diff) | |
download | Nim-8e9551b1c7614029f12e7d62ba81f367d1aaf6bd.tar.gz |
fixex merge conflicts
Diffstat (limited to 'compiler/options.nim')
-rw-r--r-- | compiler/options.nim | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/options.nim b/compiler/options.nim index 7ee8f8d4c..bebbf4544 100644 --- 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 |