summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-12-09 00:39:53 -0400
committerJoey Hess2014-12-09 00:39:53 -0400
commit36eec4e2ea9fd22973dfb492363b407f1bcf621a (patch)
treeb1b639014bacd5b6ce5f7e060847ed05c4b3122e
parent7a71cc04551040d4234fdb9ee49cf4162035386c (diff)
parent3c48f6ac937b88f5fa4e953f505086429f45dd58 (diff)
Merge branch 'joeyconfig'
-rw-r--r--propellor.cabal1
1 files changed, 0 insertions, 1 deletions
diff --git a/propellor.cabal b/propellor.cabal
index b0ead4b4..d3225cf5 100644
--- a/propellor.cabal
+++ b/propellor.cabal
@@ -18,7 +18,6 @@ Extra-Source-Files:
config-simple.hs
config-joey.hs
config.hs
- propellor.1
debian/changelog
debian/README.Debian
debian/compat