Gaze/SpaceVim
1
0
Fork 0
mirror of https://github.com/SpaceVim/SpaceVim.git synced 2025-02-09 12:30:05 +08:00
Code Issues Projects Releases Wiki Activity

Fix comflict

Browse Source
This commit is contained in:
wsdjeg 2017-06-27 20:55:57 +08:00
commit f1c37ea24f
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
autoload/SpaceVim.vim
View File

@ -416,7 +416,6 @@ let g:spacevim_leader_guide_submode_mappings = {'<C-C>': "win_close"}
command -nargs=1 LeaderGuide call SpaceVim#mapping#guide#start_by_prefix('0', <args>) command -nargs=1 LeaderGuide call SpaceVim#mapping#guide#start_by_prefix('0', <args>)
"====
function! SpaceVim#loadCustomConfig() abort function! SpaceVim#loadCustomConfig() abort
let custom_confs_old = SpaceVim#util#globpath(getcwd(), '.local.vim') let custom_confs_old = SpaceVim#util#globpath(getcwd(), '.local.vim')

1
docs/documentation.md
View File

@ -865,6 +865,7 @@ Key Binding | Description
`l` or `Enter` | open file in one window `l` or `Enter` | open file in one window
`sg` | open file in an vertically split window `sg` | open file in an vertically split window
`sv` | open file in an horizontally split window `sv` | open file in an horizontally split window
<<<<<<< HEAD
### Commands starting with `g` ### Commands starting with `g`