diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2018-07-18 09:46:30 +0200 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2018-07-18 09:46:30 +0200 |
| commit | 4389409e2657e4cec098180299b2d41b1a3a40f7 (patch) | |
| tree | bdeb765d6687ec0aa175d6cbef3458b18b76b1d1 /copying.txt | |
| parent | 32afdc09c6e2e6b32566df9e70cb71ae43eb9355 (diff) | |
| parent | 6eedac3207cad9f7b4bfe8d631a9373a91b85846 (diff) | |
| download | Nim-4389409e2657e4cec098180299b2d41b1a3a40f7.tar.gz | |
fix merge conflict
Diffstat (limited to 'copying.txt')
0 files changed, 0 insertions, 0 deletions