summaryrefslogtreecommitdiff
path: root/propellor.cabal
diff options
context:
space:
mode:
Diffstat (limited to 'propellor.cabal')
-rw-r--r--propellor.cabal2
1 files changed, 1 insertions, 1 deletions
diff --git a/propellor.cabal b/propellor.cabal
index fcad09e5..a631f262 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