diff options
| author | Vito G. Graffagnino <vito@graffagnino.xyz> | 2022-05-28 12:18:03 +0100 |
|---|---|---|
| committer | Vito G. Graffagnino <vito@graffagnino.xyz> | 2022-05-28 12:18:03 +0100 |
| commit | e76f0ee92723ec238521383e4b4d3af0281a462b (patch) | |
| tree | dea09a92c25c72563ecd7b341289c864e8dc323b /lua/user/nvim-tree.lua | |
| parent | 60c29a60a338d81bd93d7784595c3e91f0772053 (diff) | |
| parent | a77e1095d3a820c975f68bbcfbedea0185096378 (diff) | |
Merge branch 'vgg' into 17-project17-project
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, |