From 8a7967f6fb5070c0f5a1a8efb2d1c1b6062662e3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Sat, 23 Jun 2018 15:18:56 -0400
Subject: clean up after merge

---
 config.hs         | 2 +-
 privdata/relocate | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 privdata/relocate

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
-- 
cgit v1.3-2-g0d8e