Fix merge conflict.

2023-06-30 11:35:59 +01:00 · 2023-06-30 11:35:59 +01:00 · 0d1941f264
parent 6495b55b9d
commit 0d1941f264
1 changed files with 0 additions and 4 deletions
--- 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