Merge pull request #23 from Hi-Angel/rm-smerge-font-lock-redefinition

Avoid redefining conflict marker faces from smerge-mode

Author: purcell

purescript-font-lock.el

@@ -211,9 +211,6 @@ Returns keywords suitable for `font-lock-keywords'."
     (setq keywords
           `(;; NOTICE the ordering below is significant
             ;;
-            ("^<<<<<<< .*$" 0 'font-lock-warning-face t)
-            ("^=======" 0 'font-lock-warning-face t)
-            ("^>>>>>>> .*$" 0 'font-lock-warning-face t)
             ("^#.*$" 0 'font-lock-preprocessor-face t)
 
             (,toplevel-keywords 1 (symbol-value 'purescript-keyword-face))