summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2018-04-30 09:23:06 -0400
committerJoey Hess2018-04-30 09:23:06 -0400
commit0f5bbbb914e20430b97a7840623c7299422c45ad (patch)
treed8724f1345587724d37b03fa396089b64924026f
parentf675115451a997828d93232a9debee17f2618ead (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