clarify
authorLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Fri, 27 Apr 2018 03:46:55 +0000 (04:46 +0100)
committerLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Fri, 27 Apr 2018 03:46:55 +0000 (04:46 +0100)
commit3ebe82ec5a6bb2f32306efe7109e245fa320e8b3
treeffb6202f72d193ff6b9e2771ef82d35f1522314e
parenta2c7342d6b63c68378c913de3db86ccbe1838972
clarify
isa_conflict_resolution.mdwn