Skip to content

Commit 6d49bf5

Browse files
committed
fix: resolve conflict
1 parent 31f4de4 commit 6d49bf5

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

  • src/libs/actions/OnyxDerived/configs

src/libs/actions/OnyxDerived/configs/todos.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
2-
import {isArchivedReport, isCurrentUserSubmitter, isOpenExpenseReport} from '@libs/ReportUtils';
3-
import {isApproveAction, isExportAction, isPrimaryPayAction, isSubmitAction} from '@libs/ReportPrimaryActionUtils';
4-
import {hasOnlyNonReimbursableTransactions} from '@libs/ReportUtils';
2+
import {isApproveAction, isExportAction, isPrimaryPayAction} from '@libs/ReportPrimaryActionUtils';
3+
import {hasOnlyNonReimbursableTransactions, isArchivedReport, isCurrentUserSubmitter, isOpenExpenseReport} from '@libs/ReportUtils';
54
import createOnyxDerivedValueConfig from '@userActions/OnyxDerived/createOnyxDerivedValueConfig';
65
import CONST from '@src/CONST';
76
import ONYXKEYS from '@src/ONYXKEYS';

0 commit comments

Comments
 (0)