summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-12-29 12:29:30 -0400
committerJoey Hess2017-12-29 12:29:30 -0400
commit9a19ef9e3878747ce9c5085e7819935f57ef10c5 (patch)
treebc7aea68a9229fce8afb7fe3f844ed79b7fc04ad
parentea631e8519106a09d869fda6d54d1fd2d808169a (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