From c6c0e339705fe6cdcf85ed8d3b181a27a92111ea Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Tue, 7 May 2024 13:56:10 +0700 Subject: [PATCH] feat(nvim): Add git-conflict.nvim --- .config/nvim/lazy-lock.json | 1 + .config/nvim/lua/null/plugins/init.lua | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index bfc5489..52e2b70 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -3,6 +3,7 @@ "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "git-conflict.nvim": { "branch": "main", "commit": "4c8e252b87d54d944c1e56bfb477f78b6fdaf661" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, diff --git a/.config/nvim/lua/null/plugins/init.lua b/.config/nvim/lua/null/plugins/init.lua index ac3366e..b813a30 100644 --- a/.config/nvim/lua/null/plugins/init.lua +++ b/.config/nvim/lua/null/plugins/init.lua @@ -77,4 +77,10 @@ return { dependencies = { "nvim-lua/plenary.nvim" }, config = true, }, + { + "akinsho/git-conflict.nvim", + event = "LazyFile", + version = "*", + config = true, + }, }