Skip to content

Commit

Permalink
Merge branch 'develop' (v0.26.2)
Browse files Browse the repository at this point in the history
  • Loading branch information
syl20bnr committed Dec 7, 2014
2 parents 5fb8a50 + a9e1236 commit ce7ee1c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions spacemacs/packages.el
Original file line number Diff line number Diff line change
Expand Up @@ -1120,9 +1120,9 @@ determine the state to enable when escaping from the insert state.")
(guide-key-mode -1)
(guide-key-mode)))
(evil-leader/set-key "tG" 'spacemacs/toggle-guide-key)
(setq guide-key/guide-key-sequence '("C-x"
(setq guide-key/guide-key-sequence `("C-x"
"C-c"
dotspacemacs-leader-key
,dotspacemacs-leader-key
"g"
"z"
"C-h")
Expand Down

0 comments on commit ce7ee1c

Please sign in to comment.