fix copilot-cmp

6 months ago · 3df4eaea4c
parent 0a17cda3cf
commit 3df4eaea4c
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)
  },
 }