Avoid redefining conflict marker faces from smerge-mode#23

purcell merged 1 commit intopurescript-emacs:masterpurescript-emacs/purescript-mode:masterfrom

Hi-Angel:rm-smerge-font-lock-redefinitionHi-Angel/purescript-mode:rm-smerge-font-lock-redefinitionCopy head branch name to clipboard