1 files changed, 0 insertions, 32 deletions
diff --git a/test/catlfish-test-local-merge.cfg b/test/catlfish-test-local-merge.cfg
deleted file mode 100644
index 9283136..0000000
--- a/test/catlfish-test-local-merge.cfg
+++ /dev/null
@@ -1,32 +0,0 @@
-nodename: merge-1
-
-localnodes:
-        - merge-1
-
-paths:
-        configdir: .
-        mergedb: mergedb
-        # TODO: https_certfile and https_keyfile not strictly necessary for primary merge
-        https_certfile: httpscert/httpscert-1.pem
-        https_keyfile: httpscert/httpskey-1.pem
-        https_cacertfile: httpsca/demoCA/cacert.pem
-        publickeys: publickeys
-        logpublickey: keys/logkey.pem
-        privatekeys: privatekeys
-        verifycert_bin: ../bin/verifycert.erl.escript
-        knownroots: known_roots/
-
-logadminkey: MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEQ
-    Ah9sZ2CD+JeLbprS6AFcZbo0TGCH0rtEnr2Q3JW0ylhfA+
-    0/WLu755b3soVX/wI23vqCVGC7N9fOB2WUltveQ==
-
-merge:
-        min-delay: 1
-        backup-window-size: 2
-        backup-sendlog-chunksize: 1
-        backup-sendentries-chunksize: 1
-        dist-window-size: 2
-        dist-sendlog-chunksize: 1
-        dist-sendentries-chunksize: 1
-
-configurl: file:///CURRENTWORKINGDIRECTORY/catlfish-test-generated.cfg