From 5a604e35a183501ceedba2144be1edd315737127 Mon Sep 17 00:00:00 2001 From: hughhhh Date: Fri, 4 Jun 2021 11:34:13 -0400 Subject: [PATCH] remove merge conflicts --- .../src/views/CRUD/data/database/DatabaseModal/index.tsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx index b0278139a1178..9527518cf755d 100644 --- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx +++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx @@ -163,13 +163,11 @@ function dbReducer( [action.payload.name]: action.payload.value, }; case ActionType.fetched: -<<<<<<< HEAD - case ActionType.dbSelected: return { + engine: trimmedState.engine, + configuration_method: trimmedState.configuration_method, ...action.payload, }; -======= ->>>>>>> pexdax/db-connection-ui-show-preferred case ActionType.dbSelected: return { ...action.payload,