resolve conflicts

Expensify · Mar 14, 2024 · 382be24 · 382be24
1 parent 852f87b
commit 382be24
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
@@ -439,12 +439,8 @@ function InitialSettingsPage({session, userWallet, bankAccountList, fundList, wa
 
     return (
         <ScreenWrapper
-<<<<<<< HEAD
-            style={[styles.w100, styles.pt4]}
-=======
             style={[styles.w100, styles.pb0]}
             includePaddingTop={false}
->>>>>>> 35e9e15 (Merge pull request #38343 from ahmedGaber93/fix-38328)
             includeSafeAreaPaddingBottom={false}
             testID={InitialSettingsPage.displayName}
         >