From 01bc4b40d3916d8f48f14b1be242379e1c806c41 Mon Sep 17 00:00:00 2001
From: jdhao <jdhao@hotmail.com>
Date: Thu, 1 Feb 2024 20:51:48 +0100
Subject: [PATCH] update used plugins

---
 lua/plugin_specs.lua | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lua/plugin_specs.lua b/lua/plugin_specs.lua
index 55d6f89..a585ee1 100644
--- a/lua/plugin_specs.lua
+++ b/lua/plugin_specs.lua
@@ -121,7 +121,11 @@ local plugin_specs = {
       "nvim-telescope/telescope-symbols.nvim",
     },
   },
-
+  {
+    "lukas-reineke/headlines.nvim",
+    dependencies = "nvim-treesitter/nvim-treesitter",
+    config = true, -- or `opts = {}`
+  },
   -- A list of colorscheme plugin you may want to try. Find what suits you.
   { "navarasu/onedark.nvim", lazy = true },
   { "sainnhe/edge", lazy = true },
@@ -287,7 +291,7 @@ local plugin_specs = {
 
   -- Better git log display
   { "rbong/vim-flog", cmd = { "Flog" } },
-  { "christoomey/vim-conflicted", cmd = { "Conflicted" } },
+  { "akinsho/git-conflict.nvim", version = "*", config = true },
   {
     "ruifm/gitlinker.nvim",
     event = "User InGitRepo",