diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2018-09-11 17:27:47 +0200 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2018-09-11 17:27:47 +0200 |
| commit | f7d1902043c1bc70ba0bb159a3e8c71b78947ad7 (patch) | |
| tree | 96adf0fef3b9f1af4b318c1b639797dcca185874 /lib/system/hti.nim | |
| parent | 0495e6cf3a1cf0f5f71622a8408d24fbc27642a0 (diff) | |
| parent | af94946517d4e07e91b5c5ca21d58645f6da86c4 (diff) | |
| download | Nim-f7d1902043c1bc70ba0bb159a3e8c71b78947ad7.tar.gz | |
fixes merge conflicts
Diffstat (limited to 'lib/system/hti.nim')
| -rw-r--r-- | lib/system/hti.nim | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/system/hti.nim b/lib/system/hti.nim index 45b1d1cd3..bb3769ac4 100644 --- a/lib/system/hti.nim +++ b/lib/system/hti.nim @@ -7,7 +7,7 @@ # distribution, for details about the copyright. # -when declared(NimString): +when declared(ThisIsSystem): # we are in system module: {.pragma: codegenType, compilerproc.} else: |