diff options
| author | Vito G. Graffagnino <vito@graffagnino.xyz> | 2022-05-28 12:22:12 +0100 |
|---|---|---|
| committer | Vito G. Graffagnino <vito@graffagnino.xyz> | 2022-05-28 12:22:12 +0100 |
| commit | b49b14da051b693036bf8d71dc9932b31a8cafa0 (patch) | |
| tree | 45d9b23ed7b63ab3f64b0558c5265d117fbbea63 /lua/user/nvim-tree.lua | |
| parent | e07a1d37116bf2aafef18a7f2ef71e45e15ec5cc (diff) | |
| parent | 7ccd48274bdd76b76fcffe9073de62289bcfcc22 (diff) | |
Merge branch 'vgg' into 19-indentline19-indentline
Diffstat (limited to 'lua/user/nvim-tree.lua')
| -rw-r--r-- | lua/user/nvim-tree.lua | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lua/user/nvim-tree.lua b/lua/user/nvim-tree.lua index 9c5170c..c64c5e1 100644 --- a/lua/user/nvim-tree.lua +++ b/lua/user/nvim-tree.lua @@ -94,10 +94,13 @@ nvim_tree.setup { number = false, relativenumber = false, }, +<<<<<<< HEAD trash = { cmd = "trash", require_confirm = true, }, +======= +>>>>>>> vgg quit_on_open = 0, git_hl = 1, disable_window_picker = 0, |