From 57589cd7eb21ec6d46ae9c451b45e51f4fce181f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 24 Mar 2016 14:58:37 -0400 Subject: fix hook name --- propellor.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/propellor.cabal b/propellor.cabal index 7b9b8885..dc322e88 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -19,7 +19,7 @@ Extra-Source-Files: config-freebsd.hs joeyconfig.hs config.hs - contrib/post-checkout-hook + contrib/post-merge-hook debian/changelog debian/README.Debian debian/compat -- cgit v1.2.3