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