From 13fd46ce070f821ada13945ae22c13f42b8dd7ae Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Thu, 5 Oct 2023 23:56:55 +0100 Subject: [PATCH] Resolve merge conflicts --- src/pages/workspace/WorkspaceNewRoomPage.js | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js index 19dc0756d90a..d6f58a1b66ad 100644 --- a/src/pages/workspace/WorkspaceNewRoomPage.js +++ b/src/pages/workspace/WorkspaceNewRoomPage.js @@ -1,8 +1,4 @@ -<<<<<<< HEAD -import React, {useState, useEffect, useCallback, useMemo} from 'react'; -======= -import React, {useState, useCallback, useMemo, useRef} from 'react'; ->>>>>>> d420b0a (Merge pull request #28955 from Expensify/vit-revert27836) +import React, {useState, useCallback, useMemo} from 'react'; import {View} from 'react-native'; import _ from 'underscore'; import {withOnyx} from 'react-native-onyx'; @@ -29,11 +25,6 @@ import policyMemberPropType from '../policyMemberPropType'; import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView'; import compose from '../../libs/compose'; import variables from '../../styles/variables'; -<<<<<<< HEAD -import ValuePicker from '../../components/ValuePicker'; -======= -import useDelayedInputFocus from '../../hooks/useDelayedInputFocus'; ->>>>>>> d420b0a (Merge pull request #28955 from Expensify/vit-revert27836) const propTypes = { /** All reports shared with the user */