diff options
author | Araq <rumpf_a@web.de> | 2018-12-12 17:51:33 +0100 |
---|---|---|
committer | Araq <rumpf_a@web.de> | 2018-12-12 17:51:33 +0100 |
commit | ac8274c60f860b334a08199c4c0a65620962ef2a (patch) | |
tree | 6afc4046622ff10ff383a1e2a412bef325555158 /config/nim.cfg | |
parent | eb8383cb28e52bb9a790a743de442e4b71687001 (diff) | |
parent | 9f453592a40b6db4ab6715fe2f29ca573bb89148 (diff) | |
download | Nim-ac8274c60f860b334a08199c4c0a65620962ef2a.tar.gz |
fix merge conflict
Diffstat (limited to 'config/nim.cfg')
0 files changed, 0 insertions, 0 deletions