add custom extension conflict resolution section
authorLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Mon, 30 Apr 2018 12:00:45 +0000 (13:00 +0100)
committerLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Mon, 30 Apr 2018 12:00:45 +0000 (13:00 +0100)
commit0e3838edddf29a1d300e9ebacb406b4600feff28
tree00d80f6d97ad2d78f296723f34c692bc1f1e068b
parent1365f26fbdaa04dada847cc6578cb31f72dd8e0e
add custom extension conflict resolution section
isa_conflict_resolution/mvendor_march_warl.mdwn