Skip to content

Commit

Permalink
Merge pull request #33943 from Expensify/jules-fixLintError
Browse files Browse the repository at this point in the history
[NO QA] Fix consistent-type-imports lint warning

(cherry picked from commit 011e31c)
  • Loading branch information
Julesssss authored and OSBotify committed Jan 4, 2024
1 parent 116dcfb commit 0150b30
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions src/pages/workspace/invoices/WorkspaceInvoicesPage.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
<<<<<<< HEAD:src/pages/workspace/invoices/WorkspaceInvoicesPage.js
import PropTypes from 'prop-types';
import React from 'react';
import withLocalize, {withLocalizePropTypes} from '@components/withLocalize';
import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections';
import CONST from '@src/CONST';
=======
import type {StackScreenProps} from '@react-navigation/stack';
import React from 'react';
import useLocalize from '@hooks/useLocalize';
import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections';
import CONST from '@src/CONST';
import type SCREENS from '@src/SCREENS';
>>>>>>> 011e31c (Merge pull request #33943 from Expensify/jules-fixLintError):src/pages/workspace/invoices/WorkspaceInvoicesPage.tsx
import WorkspaceInvoicesNoVBAView from './WorkspaceInvoicesNoVBAView';
import WorkspaceInvoicesVBAView from './WorkspaceInvoicesVBAView';

Expand Down

0 comments on commit 0150b30

Please sign in to comment.