summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-04-17 19:43:18 -0400
committerJoey Hess2016-03-07 16:38:30 -0400
commit68253d623c8695454a703235bb65c8149272ec98 (patch)
tree2a1b59f295345b6aced1ddb3787cf3a9c774ab88
parent16a95afa2fe22a4df9c371489c4ee7ffdef8e07b (diff)
change joeyconfig back after merging from master
(cherry picked from commit 7743ef8542b6490c3c42ac826a26aa0b24991f22)
l---------config.hs2
-rwxr-xr-xdebian/rules2
2 files changed, 2 insertions, 2 deletions
diff --git a/config.hs b/config.hs
index ec313725..07959a0a 120000
--- a/config.hs
+++ b/config.hs
@@ -1 +1 @@
-config-simple.hs \ No newline at end of file
+config-joey.hs \ No newline at end of file
diff --git a/debian/rules b/debian/rules
index a71212db..c88cc004 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#!/bin/false
# Avoid using cabal, as it writes to $HOME
export CABAL=./Setup