summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-11-22 11:36:11 -0400
committerJoey Hess2016-11-22 11:36:11 -0400
commit50e5fc66f53eeb884945c7a1339e9398987f6c31 (patch)
treef4e1f4a7ba373589c917a1a30454a7a72c55688b
parent5e23f3397c0e785d04abbe38ac6c8385028cb09e (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