From 1ca6b037e54d724b8b9745119f8c505c3e169f3f Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Mon, 9 Sep 2024 13:28:57 -0600
Subject: [PATCH] resolve conflicts

---
 .../workspace/categories/WorkspaceCategoriesSettingsPage.tsx  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx
index 0c481fa8ada7..02547090cfe6 100644
--- 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>