diff options
| author | Vito G. Graffagnino <vito@graffagnino.xyz> | 2022-05-28 12:06:54 +0100 |
|---|---|---|
| committer | Vito G. Graffagnino <vito@graffagnino.xyz> | 2022-05-28 12:06:54 +0100 |
| commit | 6ae48a7acafb46fa0a6119b7634885c75edb46b7 (patch) | |
| tree | b41a00a418f158317a6d077a49cb457584d256a2 /lua/user/nvim-tree.lua | |
| parent | 8309138032f1bcd6eeb9586994994696f4786204 (diff) | |
| parent | 69ac347d940ac13320a2aa1f252b782729bf8f79 (diff) | |
Merge branch 'vgg' into 14-null-ls
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, |