Fix merge conflict leftovers

2023-07-14 13:13:13 +02:00 · 2023-07-14 13:13:13 +02:00 · 9271e8d037
parent fd74f59c39
commit 9271e8d037
1 changed files with 2 additions and 7 deletions
--- 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