From 9271e8d03776e8ef22341274cfc731a36fac3d55 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Fri, 14 Jul 2023 13:13:13 +0200
Subject: [PATCH] Fix merge conflict leftovers

---
 modules/terminal-life/nvim/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/modules/terminal-life/nvim/default.nix b/modules/terminal-life/nvim/default.nix
index 9625c009..99e555f3 100644
--- a/modules/terminal-life/nvim/default.nix
+++ b/modules/terminal-life/nvim/default.nix
@@ -114,15 +114,10 @@ in {
       # Highlight characters when using f, F, t, and T
       quick-scope
 
-      # get sudo in vim; :SudaWrite <optional filename>
+      # Get sudo in vim; :SudaWrite <optional filename>
       suda-vim
-<<<<<<< Updated upstream
-      vim-gutentags
-      vim-vinegar
-=======
 
-      # undo history etc. per project
->>>>>>> Stashed changes
+      # Undo history etc. per project
       vim-workspace-nvfetcher
 
       # JSON schemas