feat(nvim): Add git-conflict.nvim

2024-05-07 13:56:10 +07:00 · 2024-05-07 13:56:10 +07:00 · c6c0e33970
commit c6c0e33970
parent 64d2f4f025
2 changed files with 7 additions and 0 deletions
--- 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,
+	},
 }