fix conflicts

This commit is contained in:
hedy
2023-11-18 12:16:43 +08:00
2 changed files with 3 additions and 3 deletions

View File

@@ -288,7 +288,7 @@ Pass a table to the setup call with your configuration options.
-- Jump to symbol under cursor but keep focus on outline window. -- Jump to symbol under cursor but keep focus on outline window.
peek_location = 'o', peek_location = 'o',
-- Visit location in code and close outline immediately -- Visit location in code and close outline immediately
goto_and_close = '<S-Cr>' goto_and_close = '<S-Cr>',
-- Change cursor position of outline window to match current location in code. -- Change cursor position of outline window to match current location in code.
-- 'Opposite' of goto/peek_location. -- 'Opposite' of goto/peek_location.
restore_location = '<C-g>', restore_location = '<C-g>',

View File

@@ -1,4 +1,4 @@
*outline.txt* For NVIM v0.7.0 Last change: 2023 November 16 *outline.txt* For NVIM v0.7.0 Last change: 2023 November 17
============================================================================== ==============================================================================
Table of Contents *outline-table-of-contents* Table of Contents *outline-table-of-contents*
@@ -243,7 +243,7 @@ Show defaults ~
-- Jump to symbol under cursor but keep focus on outline window. -- Jump to symbol under cursor but keep focus on outline window.
peek_location = "o", peek_location = "o",
-- Visit location in code and close outline immediately -- Visit location in code and close outline immediately
goto_and_close = "<S-Cr>" goto_and_close = "<S-Cr>",
-- Change cursor position of outline window to match current location in code. -- Change cursor position of outline window to match current location in code.
-- "Opposite" of goto/peek_location. -- "Opposite" of goto/peek_location.
restore_location = "<C-g>", restore_location = "<C-g>",