summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2019-01-18 12:08:45 -0400
committerJoey Hess <joeyh@joeyh.name>2019-01-18 12:08:45 -0400
commit7da5391e0c21943157a4f49f0e4133ee92fd22c7 (patch)
tree5a1f5374b52842d4c5f1eba9b2edccef12d46eee
parente9052c03aaa6acb1140d7cc7dc003a71ebff9e9c (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