Merge branch 'master' of github.com:bbatsov/prelude
# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
This commit is contained in:
commit
11772f6612
1 changed files with 2 additions and 2 deletions
|
@ -205,8 +205,8 @@
|
|||
|
||||
;; load yasnippet
|
||||
(require 'yasnippet)
|
||||
(add-to-list 'yas/snippet-dirs prelude-snippets-dir)
|
||||
(yas/global-mode 1)
|
||||
(add-to-list 'yas-snippet-dirs prelude-snippets-dir)
|
||||
(yas-global-mode 1)
|
||||
|
||||
;; projectile is a project management mode
|
||||
(require 'projectile)
|
||||
|
|
Loading…
Reference in a new issue