resolve conflict

Expensify · Dec 12, 2023 · 6be27d4 · 6be27d4
1 parent 01096fb
commit 6be27d4
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/src/pages/iou/request/step/IOURequestStepScan/index.native.js b/src/pages/iou/request/step/IOURequestStepScan/index.native.js
@@ -15,12 +15,9 @@ import * as FileUtils from '@libs/fileDownload/FileUtils';
 import Log from '@libs/Log';
 import Navigation from '@libs/Navigation/Navigation';
 import IOURequestStepRoutePropTypes from '@pages/iou/request/step/IOURequestStepRoutePropTypes';
-<<<<<<< HEAD
-=======
 import StepScreenWrapper from '@pages/iou/request/step/StepScreenWrapper';
 import withFullTransactionOrNotFound from '@pages/iou/request/step/withFullTransactionOrNotFound';
 import withWritableReportOrNotFound from '@pages/iou/request/step/withWritableReportOrNotFound';
->>>>>>> 83bd22f (Merge pull request #32877 from Expensify/cmartins-fixMissingHeader)
 import reportPropTypes from '@pages/reportPropTypes';
 import useTheme from '@styles/themes/useTheme';
 import useThemeStyles from '@styles/useThemeStyles';
@@ -305,4 +302,4 @@ IOURequestStepScan.defaultProps = defaultProps;
 IOURequestStepScan.propTypes = propTypes;
 IOURequestStepScan.displayName = 'IOURequestStepScan';
 
-export default IOURequestStepScan;
+export default compose(withWritableReportOrNotFound, withFullTransactionOrNotFound)(IOURequestStepScan);