summaryrefslogtreecommitdiff
path: root/propellor.cabal
diff options
context:
space:
mode:
authorJoey Hess2016-03-24 15:02:29 -0400
committerJoey Hess2016-03-24 15:02:29 -0400
commit51fa88feb1fd3621360c1db5b6b771a798a25a88 (patch)
treebff3f4d8ff052c1b95c7241bed4f4b8c7ef9368d /propellor.cabal
parent416ae178ec7ed54d5740006a8dc6e1d2e30f00f4 (diff)
parent57431d90b5fb1c16973676bc6b0d32b12c26669b (diff)
Merge branch 'master' into typed-os-requirements
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