fix copilot-cmp

2024-10-10 10:48:36 -05:00 · 2024-10-10 10:48:36 -05:00 · d1de4f1dff
parent 2b7996509c
commit d1de4f1dff
1 changed files with 0 additions and 4 deletions
--- a/lua/custom/plugins/copilot-cmp.lua
+++ b/lua/custom/plugins/copilot-cmp.lua
@ -7,13 +7,9 @@ return {
    require('copilot_cmp').setup()
  end,
  opts = {
-<<<<<<< HEAD
    filetypes = {
      ['.'] = false,
      go = true,
    },
-=======
-    filetypes = { ['.'] = false },
->>>>>>> 605d213 (disable copilot)
  },
 }