Merge branch 'master' of github.com:bbatsov/prelude

Conflicts: prelude/prelude-auto-install.el
14 years ago · 9fcc478b97
1 changed files with 1 additions and 0 deletions
--- a/prelude/prelude-auto-install.el
+++ b/prelude/prelude-auto-install.el
@ -52,6 +52,7 @@
    ("\\.hs\\'" . haskell-mode)
    ("\\.less\\'" . less-css-mode)
    ("\\.lua\\'" . lua-mode)
    ("\\.coffee\\'" . coffee-mode)
    ("\\.erl\\'" . erlang-mode)
    ("\\.feature\\'" . feature-mode)))