feat

ADGEfficiency · Dec 24, 2024 · 0729d8a · 0729d8a
1 parent 8446bd4
commit 0729d8a
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/nvim/lua/plugins/text-editing.lua b/nvim/lua/plugins/text-editing.lua
@@ -8,8 +8,6 @@ return {
 	{ "tpope/vim-repeat" },
 	{ "farmergreg/vim-lastplace" },
 	{ "axelf4/vim-strip-trailing-whitespace" },
-<<<<<<< HEAD
-
 	{
 		"folke/zen-mode.nvim",
 		opts = {
@@ -30,11 +28,6 @@ return {
 		dependencies = { "nvim-lua/plenary.nvim" },
 		opts = {},
 	},
-||||||| 4de39f3
-=======
-
-	{ "folke/zen-mode.nvim" },
->>>>>>> 44d0041f59c821dbe9771616034d3af6a00f08b6
 	{
 		"mbbill/undotree",
 		config = function()
@@ -131,7 +124,7 @@ return {
 	},
 	{
 		"iamcco/markdown-preview.nvim",
-    enable=false,
+		enable = false,
 		cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" },
 		ft = { "markdown" },
 		build = function()