fix(nvim): resolve merge conflict

2022-08-02 17:06:52 -05:00 · 2022-08-02 17:06:52 -05:00 · 66d22882a6
commit 66d22882a6
parent 3b3f3abe81
1 changed files with 1 additions and 15 deletions
--- a/dots/.nvim-environments/primary/config/lua/plugins/configs/_neoclip.lua
+++ b/dots/.nvim-environments/primary/config/lua/plugins/configs/_neoclip.lua
@ -1,17 +1,3 @@
-<<<<<<< HEAD
-local loaded, neoclip = pcall(require, "neoclip")
-if not loaded then
-    return
-end
-neoclip.setup({
-||||||| b136610 (feat(nvim): use loaded, plugin format)
-local neoclip = pcall(require, "neoclip")
-if not neoclip then
-    return
-end
-neoclip.setup({
-=======
-require('neoclip').setup({
->>>>>>> parent of b136610 (feat(nvim): use loaded, plugin format)
+require("neoclip").setup({
    enable_persistent_history = true,
 })