1 files changed, 11 insertions, 0 deletions
diff --git a/lua/plugins.lua b/lua/plugins.lua
index 8a36e7c..f399c25 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -113,6 +113,17 @@ return require("packer").startup(function(use)
 			}
 		}
 	}
+
+	use {
+		"Snikimonkd/telescope-git-conflicts.nvim",
+		commit = "1ac7040f601d16ab3800bdda6f5912a0e385cb29",
+		requires = {
+			{
+				"nvim-lua/plenary.nvim",
+				commit = "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683"
+			}
+		}
+	}
 	-- Telescope end
 
 	-- Markdown