2023-07-02 12:59:05 +00:00
1 changed files with 1 additions and 4 deletions
--- a/flake.nix
+++ b/flake.nix
@ -54,12 +54,9 @@
    nixos-hardware,
    agenix,
    deploy,
-<<<<<<< HEAD
+    nvfetcher,
    triton-vmtools,
    keycloak-theme-pub-solar,
-=======
-    nvfetcher,
->>>>>>> main
    ...
  } @ inputs:
    digga.lib.mkFlake