remove merge conflicts

apache · Jun 4, 2021 · 5a604e3 · 5a604e3
1 parent 514ec63
commit 5a604e3
Showing 1 changed file with 2 additions and 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
@@ -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,