-
Brad King authored
Use a long conflict marker size that is unlikely to be in conflict with a `=======` section header underline.
da60adc3
Use a long conflict marker size that is unlikely to be in conflict with a `=======` section header underline.