1 files changed, 0 insertions, 14 deletions
diff --git a/lua/user/nvim-tree.lua b/lua/user/nvim-tree.lua
index c64c5e1..9b6aa42 100644
--- a/lua/user/nvim-tree.lua
+++ b/lua/user/nvim-tree.lua
@@ -94,22 +94,8 @@ 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,
-  root_folder_modifier = ":t",
-  show_icons = {
-    git = 1,
-    folders = 1,
-    files = 1,
-    folder_arrows = 1,
-    tree_width = 30,
-  },
 }