resolve merge conflict in authors

This commit is contained in:
David Halter
2013-09-28 19:48:20 +04:30
6 changed files with 69 additions and 0 deletions

View File

@@ -37,6 +37,7 @@ Contents *jedi-vim-contents*
6.7. use_tabs_not_buffers |g:jedi#use_tabs_not_buffers|
6.8. squelch_py_warning |g:jedi#squelch_py_warning|
6.9. completions_enable |g:jedi#completions_enable|
6.10. use_splits_not_buffers |g:jedi#use_splits_not_buffers|
7. Testing |jedi-vim-testing|
8. Contributing |jedi-vim-contributing|
9. License |jedi-vim-license|
@@ -394,6 +395,15 @@ YCM).
Options: 0 or 1
Default: 1
------------------------------------------------------------------------------
6.10. `g:jedi#use_splits_not_buffers` *g:jedi#use_splits_not_buffers*
If you want to open new split for "go to", you could set this option to the
direction which you want to open a split with.
Options: top, left, right or bottom
Default: "" (not enabled by default)
==============================================================================
7. Testing *jedi-vim-testing*