non important commit

2025-12-16 18:08:42 +01:00 · 2025-12-16 18:08:42 +01:00 · 8f8fb5e0e0
commit 8f8fb5e0e0
parent b595aad68c
3 changed files with 3 additions and 16 deletions
--- a/home/modules/nvf.nix
+++ b/home/modules/nvf.nix
@ -71,13 +71,8 @@
        html = {
          enable = true;
          lsp.servers = [
-<<<<<<< HEAD
-            "superhtml"
-            "emmet-ls"
-=======
            "emmet-ls"
            "superhtml"
->>>>>>> d8e7e28 (dunno)
          ];
        };