From 600a084a4b8b155dddaf427c4cea979688b8f637 Mon Sep 17 00:00:00 2001
From: Producer Matt <58014742+ProducerMatt@users.noreply.github.com>
Date: Sat, 22 Jun 2024 14:45:21 -0500
Subject: [PATCH] oops

---
 flake.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index b9a4f96..bc6777f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,7 +30,7 @@
         # Git pre-push checks
         pc-hooks = git-hooks.lib.${system}.run {
           # only run on push and directly calling `pre-commit` in the shell
-          default_stages = ["manual" "push"];
+          default_stages = ["manual" "push" "pre-commit-merge"];
           src = ./.;
           hooks = {
             check-merge-conflicts.enable = true;