summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-07-29 10:53:08 -0400
committerJoey Hess2016-07-29 10:53:08 -0400
commitb013d44f1127ec4e07ed2e5751b448a1cf437d39 (patch)
tree80d7030bf2a85b47a8a369e15948115d87ef25a5
parent60ceb9659ca99b432535fe46618f43a1d02f45ac (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