clarify
authorLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Thu, 26 Apr 2018 23:53:12 +0000 (00:53 +0100)
committerLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Thu, 26 Apr 2018 23:53:12 +0000 (00:53 +0100)
commita2c7342d6b63c68378c913de3db86ccbe1838972
treed4f690fbb15d5ebe3772d73d4bd2efafff095a47
parentad6830542628b57b46c07597148684f4eb400a3b
clarify
isa_conflict_resolution.mdwn