diff options
| author | Vito G. Graffagnino <vito@graffagnino.xyz> | 2022-05-28 12:29:21 +0100 |
|---|---|---|
| committer | Vito G. Graffagnino <vito@graffagnino.xyz> | 2022-05-28 12:29:21 +0100 |
| commit | 418fed300187f0cd2dbd8d8fc791dd4aa08b70fe (patch) | |
| tree | 401ce42a74856588876de2d54e9e785c9f5cc751 /lua/user/nvim-tree.lua | |
| parent | f84566dc6e9533f5fa7d377fe26c1565aa7fe213 (diff) | |
| parent | b49b14da051b693036bf8d71dc9932b31a8cafa0 (diff) | |
Merge branch 'vgg' into 21-whichkey21-whichkey
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, |