summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-03-24 14:58:37 -0400
committerJoey Hess2016-03-24 14:58:37 -0400
commit57589cd7eb21ec6d46ae9c451b45e51f4fce181f (patch)
tree3d9593943ee8f31fc03fcd42905e060a7fedc32b
parenta3a771f0ca82ba709ccfd1e15b10df6070b176ac (diff)
fix hook name
-rw-r--r--propellor.cabal2
1 files changed, 1 insertions, 1 deletions
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