From 1f5d757474d8bb7b362364e46fc99f4a3685e143 Mon Sep 17 00:00:00 2001 From: Kyren223 Date: Sat, 2 Aug 2025 19:58:43 +0300 Subject: Updated conflict-marker to fix issues (works fine now) --- .config/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index bbf7b24..dea897d 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -7,7 +7,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": "18eb4960e06a2762b69066ec4fdd2957caeab41f" }, + "conflict-marker.nvim": { "branch": "master", "commit": "7fe1db4bd1cf6e585456f29ea25e2c9c9154c34b" }, "conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "gitsigns.nvim": { "branch": "main", "commit": "8270378ab83540b03d09c0194ba3e208f9d0cb72" }, -- cgit v1.3.1