From 1717641ed2840cf9b349abeeac7fd91eb5b833ed Mon Sep 17 00:00:00 2001 From: Kyren223 Date: Wed, 30 Jul 2025 18:27:42 +0300 Subject: Added conflict highlighting in nvim --- .config/nvim/lazy-lock.json | 1 + 1 file changed, 1 insertion(+) (limited to '.config/nvim/lazy-lock.json') diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 41b9177..d48049b 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -9,6 +9,7 @@ "ccc.nvim": { "branch": "main", "commit": "9d1a256e006decc574789dfc7d628ca11644d4c2" }, "clangd_extensions.nvim": { "branch": "main", "commit": "db28f29be928d18cbfb86fbfb9f83f584f658feb" }, "colorful-menu.nvim": { "branch": "master", "commit": "bc3e82609f2fcf7dad7ca87c20e65e51d5d9d87c" }, + "conflict-marker.nvim": { "branch": "master", "commit": "4cf4f0460d0726cd720a836409dc454f50de8e9e" }, "conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "gitsigns.nvim": { "branch": "main", "commit": "1fcaddcc427ff5802b6602f46de37a5352d0f9e0" }, -- cgit v1.3.1