summaryrefslogtreecommitdiff
path: root/lua/user/nvim-tree.lua
diff options
context:
space:
mode:
Diffstat (limited to 'lua/user/nvim-tree.lua')
-rw-r--r--lua/user/nvim-tree.lua3
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,