add encoding explanation
authorLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Sun, 10 Jun 2018 02:13:42 +0000 (03:13 +0100)
committerLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Sun, 10 Jun 2018 02:13:42 +0000 (03:13 +0100)
commit6c351551805df9cad8314dc981d7a76d3a44c917
treef9daee201232e5b7f4d9b1c417e0018c76b54229
parent744d92c82b3d23ddd68333aa1261d7e35f86b9f6
add encoding explanation
isa_conflict_resolution.mdwn