Price/dots
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(nvim): resolve merge conflict

Browse Source
This commit is contained in:
Price Hiller 2022-08-02 17:06:52 -05:00
parent 3b3f3abe81
commit 66d22882a6
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dots/.nvim-environments/primary/config/lua/plugins/configs/_neoclip.lua
View File

@ -1,17 +1,3 @@
<<<<<<< HEAD require("neoclip").setup({
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)
enable_persistent_history = true, enable_persistent_history = true,
}) })