Merge branch 'master' of github.com:bbatsov/prelude
Conflicts: prelude/prelude-auto-install.el
This commit is contained in:
commit
9fcc478b97
1 changed files with 1 additions and 0 deletions
|
@ -52,6 +52,7 @@
|
|||
("\\.hs\\'" . haskell-mode)
|
||||
("\\.less\\'" . less-css-mode)
|
||||
("\\.lua\\'" . lua-mode)
|
||||
("\\.coffee\\'" . coffee-mode)
|
||||
("\\.erl\\'" . erlang-mode)
|
||||
("\\.feature\\'" . feature-mode)))
|
||||
|
||||
|
|
Loading…
Reference in a new issue