From 8426b9461aafbd998469e9fbc6d9e693f9fe56a1 Mon Sep 17 00:00:00 2001
From: ahuston-0 <aliceghuston@gmail.com>
Date: Wed, 17 Apr 2024 20:50:57 -0400
Subject: [PATCH] fixes :)

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
---
 flake.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/flake.nix b/flake.nix
index 46222e5..9d5b876 100644
--- a/flake.nix
+++ b/flake.nix
@@ -308,8 +308,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;
         }