summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-06-30 14:15:36 -0400
committerJoey Hess2017-06-30 14:15:36 -0400
commitb9c7cfa7d5d2e8985d05ecee8dd7f6f26fbdfc7d (patch)
treee0fad83912ddcf3f44174a92d3b001d1aa1cc739
parentcca935d762b0d1c25e4324262b479b7e2ca39bf2 (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