Fix conflicts

Expensify · Jul 3, 2024 · c6ae46a · c6ae46a
1 parent 98effb3
commit c6ae46a
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/src/CONST.ts b/src/CONST.ts
@@ -364,12 +364,9 @@ const CONST = {
         NETSUITE_ON_NEW_EXPENSIFY: 'netsuiteOnNewExpensify',
         REPORT_FIELDS_FEATURE: 'reportFieldsFeature',
         WORKSPACE_FEEDS: 'workspaceFeeds',
-<<<<<<< HEAD
-=======
         NETSUITE_USA_TAX: 'netsuiteUsaTax',
         INTACCT_ON_NEW_EXPENSIFY: 'intacctOnNewExpensify',
         COMMENT_LINKING: 'commentLinking',
->>>>>>> 292d7b2c (Merge pull request #44780 from Expensify/jasper-commentLinkingBeta)
     },
     BUTTON_STATES: {
         DEFAULT: 'default',

diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts
@@ -52,8 +52,6 @@ function canUseWorkspaceFeeds(betas: OnyxEntry<Beta[]>): boolean {
     return !!betas?.includes(CONST.BETAS.WORKSPACE_FEEDS) || canUseAllBetas(betas);
 }
 
-<<<<<<< HEAD
-=======
 function canUseNetSuiteUSATax(betas: OnyxEntry<Beta[]>): boolean {
     return !!betas?.includes(CONST.BETAS.NETSUITE_USA_TAX) || canUseAllBetas(betas);
 }
@@ -62,7 +60,6 @@ function canUseCommentLinking(betas: OnyxEntry<Beta[]>): boolean {
     return !!betas?.includes(CONST.BETAS.COMMENT_LINKING) || canUseAllBetas(betas);
 }
 
->>>>>>> 292d7b2c (Merge pull request #44780 from Expensify/jasper-commentLinkingBeta)
 /**
  * Link previews are temporarily disabled.
  */
@@ -83,9 +80,6 @@ export default {
     canUseNetSuiteIntegration,
     canUseReportFieldsFeature,
     canUseWorkspaceFeeds,
-<<<<<<< HEAD
-=======
     canUseNetSuiteUSATax,
     canUseCommentLinking,
->>>>>>> 292d7b2c (Merge pull request #44780 from Expensify/jasper-commentLinkingBeta)
 };