diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2018-08-19 15:14:03 +0200 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2018-08-19 15:14:03 +0200 |
| commit | 696c0c48c7c794453b79d2abf45c3f390a9b6fba (patch) | |
| tree | 8a74e09ce97f64ea0e3377f6440a2e79d54ce0fd /doc/manual | |
| parent | 7ac6462cbd30bcdb1c3805fbb06be13b3346ce2a (diff) | |
| parent | f2263cd129ff41259db99c68e98f966a681adf78 (diff) | |
| download | Nim-696c0c48c7c794453b79d2abf45c3f390a9b6fba.tar.gz | |
fixes merge conflict
Diffstat (limited to 'doc/manual')
0 files changed, 0 insertions, 0 deletions