MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tidy up, removing leftover indexeddb files

This commit is contained in:
Martin McKeaveney 2020-04-24 18:10:33 +01:00
parent 7ad66d455a
commit 8e38fab727
2 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/server/config.js
View File

@ -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,
})

7
packages/server/middleware/routes/neo/tests/couchTestUtils.js
View File

@ -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 CouchDB = require("../../../../db");
const CLIENT_DB_ID = "client-testing"; const CLIENT_DB_ID = "client-testing";
>>>>>>> fixing tests
const TEST_APP_ID = "test-app"; const TEST_APP_ID = "test-app";
exports.createModel = async (instanceId, model) => { exports.createModel = async (instanceId, model) => {