From 0d1941f26413634ccaa4cad4c6d500750c55523c Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 30 Jun 2023 11:35:59 +0100 Subject: [PATCH] Fix merge conflict. --- packages/server/src/api/controllers/datasource.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/server/src/api/controllers/datasource.ts b/packages/server/src/api/controllers/datasource.ts index c0aff2b4a9..069842a020 100644 --- a/packages/server/src/api/controllers/datasource.ts +++ b/packages/server/src/api/controllers/datasource.ts @@ -344,17 +344,13 @@ export async function save( setDefaultDisplayColumns(datasource) } -<<<<<<< HEAD if (preSaveAction[datasource.source]) { await preSaveAction[datasource.source](datasource) } - const dbResp = await db.put(datasource) -======= const dbResp = await db.put( sdk.tables.populateExternalTableSchemas(datasource) ) ->>>>>>> d4af3bf8029c38e19b95a4051c08fa72741ea142 await events.datasource.created(datasource) datasource._rev = dbResp.rev