From 4ca506ebfe91728dcbb2681d208db5cc7f58a1c5 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Fri, 24 Apr 2020 18:10:33 +0100
Subject: [PATCH] tidy up, removing leftover indexeddb files

---
 packages/server/config.js                           | 13 -------------
 .../middleware/routes/neo/tests/couchTestUtils.js   |  7 -------
 2 files changed, 20 deletions(-)
 delete mode 100644 packages/server/config.js

diff --git a/packages/server/config.js b/packages/server/config.js
deleted file mode 100644
index 25256fcc13..0000000000
--- a/packages/server/config.js
+++ /dev/null
@@ -1,13 +0,0 @@
-module.exports = () => ({
-  datastore: "local",
-  datastoreConfig: {
-    rootPath: "./myapps/.data",
-  },
-  keys: ["secret1", "secret2"],
-  port: 4001,
-  latestPackagesFolder: "./myapps",
-  extraMasterPlugins: {},
-  dev: true,
-  customizeMaster: appDefinition => appDefinition,
-  useAppRootPath: true,
-})
diff --git a/packages/server/middleware/routes/neo/tests/couchTestUtils.js b/packages/server/middleware/routes/neo/tests/couchTestUtils.js
index ec230c2bec..342d20edd7 100644
--- a/packages/server/middleware/routes/neo/tests/couchTestUtils.js
+++ b/packages/server/middleware/routes/neo/tests/couchTestUtils.js
@@ -1,12 +1,5 @@
-<<<<<<< HEAD
-const couchdb = require("../../../../db")
-const createClientDb = require("../../../../db/initialiseClientDb")
-
-const CLIENT_DB_ID = "client-testing"
-=======
 const CouchDB = require("../../../../db");
 const CLIENT_DB_ID = "client-testing";
->>>>>>> fixing tests
 const TEST_APP_ID = "test-app";
 
 exports.createModel = async (instanceId, model) => {