resolve conflicts

Expensify · Sep 9, 2024 · 1ca6b03 · 1ca6b03
1 parent 7ca9e81
commit 1ca6b03
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx
@@ -94,11 +94,7 @@ function WorkspaceCategoriesSettingsPage({policy, route}: WorkspaceCategoriesSet
                     shouldPlaceSubtitleBelowSwitch
                 />
                 <View style={[styles.containerWithSpaceBetween]}>
-<<<<<<< Updated upstream
                     {!!currentPolicy && listItems.length > 0 && canUseWorkspaceRules && (
-=======
-                    {!!currentPolicy && listItems && false && (
->>>>>>> Stashed changes
                         <>
                             <View style={[styles.mh5, styles.mt2, styles.mb1]}>
                                 <Text style={[styles.headerText]}>{translate('workspace.categories.defaultSpendCategories')}</Text>