From fe73fe0329e3ea159d56714e5e89ef9d78d68357 Mon Sep 17 00:00:00 2001 From: Arman Date: Thu, 10 Aug 2023 16:25:18 +0200 Subject: [PATCH] fix: merge conflict --- .../settings/migrations/(import)/wizard.svelte | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/routes/console/project-[project]/settings/migrations/(import)/wizard.svelte b/src/routes/console/project-[project]/settings/migrations/(import)/wizard.svelte index f2b0e5eef..89527f3cc 100644 --- a/src/routes/console/project-[project]/settings/migrations/(import)/wizard.svelte +++ b/src/routes/console/project-[project]/settings/migrations/(import)/wizard.svelte @@ -51,11 +51,10 @@ case 'firebase': { if ($provider.projectId) { // OAuth - const res = await sdk.forProject.migrations.createFirebaseOAuthMigration( + await sdk.forProject.migrations.createFirebaseOAuthMigration( resources, $provider.projectId ); - } else if ($provider.serviceAccount) { // Manual auth await sdk.forProject.migrations.createFirebaseMigration(