Fix conflicts

Expensify · Oct 15, 2024 · c01baed · c01baed
1 parent cc76ed4
commit c01baed
Showing 1 changed file with 0 additions and 12 deletions.
diff --git a/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx b/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
@@ -20,10 +20,6 @@ import Navigation from '@libs/Navigation/Navigation';
 import OnboardingRefManager from '@libs/OnboardingRefManager';
 import type {TOnboardingRef} from '@libs/OnboardingRefManager';
 import variables from '@styles/variables';
-<<<<<<< HEAD
-import * as Policy from '@userActions/Policy/Policy';
-=======
->>>>>>> 0167316 (Merge pull request #50759 from Expensify/marcaaron-createWorkspaceOnOldDotRedirect)
 import * as Welcome from '@userActions/Welcome';
 import CONST from '@src/CONST';
 import type {OnboardingPurposeType} from '@src/CONST';
@@ -85,14 +81,6 @@ function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, ro
                 Welcome.setOnboardingErrorMessage('');
 
                 if (choice === CONST.ONBOARDING_CHOICES.MANAGE_TEAM) {
-<<<<<<< HEAD
-                    if (!onboardingPolicyID) {
-                        const {adminsChatReportID, policyID} = Policy.createWorkspace(undefined, true);
-                        Welcome.setOnboardingAdminsChatReportID(adminsChatReportID);
-                        Welcome.setOnboardingPolicyID(policyID);
-                    }
-=======
->>>>>>> 0167316 (Merge pull request #50759 from Expensify/marcaaron-createWorkspaceOnOldDotRedirect)
                     Navigation.navigate(ROUTES.ONBOARDING_EMPLOYEES.getRoute(route.params?.backTo));
                     return;
                 }