clarify
authorLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Thu, 26 Apr 2018 12:01:17 +0000 (13:01 +0100)
committerLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Thu, 26 Apr 2018 12:01:17 +0000 (13:01 +0100)
commite04a9809b245851ec0e49107545945b69db9a6e0
treea6839932563e22fcba62ebe0e8140733fe89839c
parent3f2fcb9cf9886b960fd066a8b342a299aea42088
clarify
isa_conflict_resolution.mdwn