diff options
author | Araq <rumpf_a@web.de> | 2018-08-23 11:30:55 +0200 |
---|---|---|
committer | Araq <rumpf_a@web.de> | 2018-08-23 11:30:55 +0200 |
commit | 30597e643fe8818ef1bb6cc93a5c573f92a28ea9 (patch) | |
tree | ea6de7aabdbfc5db583e2dfbaf9f792c8240a63e /appveyor.yml | |
parent | cb9e9297fba72c812913376311ca4b7ebd7e007f (diff) | |
parent | 55a86497491586dc1b5ad2f6303d53992b999ab5 (diff) | |
download | Nim-30597e643fe8818ef1bb6cc93a5c573f92a28ea9.tar.gz |
fixes merge conflict
Diffstat (limited to 'appveyor.yml')
0 files changed, 0 insertions, 0 deletions