fixes :)

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
2024-04-17 20:50:57 -04:00
parent 3955dd70aa
commit 195c1facd8
3 changed files with 13 additions and 7 deletions
--- a/flake.nix
+++ b/flake.nix
@ -344,8 +344,11 @@
          packages = [
            self.formatter.${system}
            nixpkgs.legacyPackages.${system}.deadnix
+<<<<<<< HEAD
            nixpkgs.legacyPackages.${system}.treefmt
            nixpkgs.legacyPackages.${system}.pre-commit
+=======
+>>>>>>> 7502153 (fixes :))
          ];
          shellHook = (nix-pre-commit.lib.${system}.mkConfig { inherit pkgs config; }).shellHook;
        }