From 38be54fe95556482d13554b633ef124ee33a677a Mon Sep 17 00:00:00 2001 From: Producer Matt <58014742+ProducerMatt@users.noreply.github.com> Date: Sat, 22 Jun 2024 14:46:59 -0500 Subject: [PATCH] oops --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index bc6777f..dec3f29 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" "pre-commit-merge"]; + default_stages = ["manual" "push" "pre-merge-commit"]; src = ./.; hooks = { check-merge-conflicts.enable = true;