summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-03-07 22:09:30 -0400
committerJoey Hess2016-03-07 22:09:30 -0400
commitb04fddbe0dc9d37a51ccbcc4639d090a237ce5cb (patch)
tree29333b16ad95ecd39cdc7fd8bb5d1df87999c2a2
parent08b3b128d588fbace2482530b412bc1425fe94ec (diff)
clean up after merge
l---------config.hs2
-rw-r--r--privdata/relocate1
2 files changed, 1 insertions, 2 deletions
diff --git a/config.hs b/config.hs
index 97d90636..ec313725 120000
--- a/config.hs
+++ b/config.hs
@@ -1 +1 @@
-joeyconfig.hs \ No newline at end of file
+config-simple.hs \ No newline at end of file
diff --git a/privdata/relocate b/privdata/relocate
deleted file mode 100644
index 271692d8..00000000
--- a/privdata/relocate
+++ /dev/null
@@ -1 +0,0 @@
-.joeyconfig