Resolve conflicts

Expensify · Dec 30, 2021 · 8448119 · 8448119
1 parent dd6232e
commit 8448119
Showing 1 changed file with 0 additions and 16 deletions.
diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -138,26 +138,10 @@ class WorkspaceNewRoomPage extends React.Component {
 
         return (
             <ScreenWrapper>
-<<<<<<< HEAD
-                <HeaderWithCloseButton
-                    title={this.props.translate('newRoomPage.newRoom')}
-                    onCloseButtonPress={() => Navigation.dismissModal()}
-                />
-                <ScrollView style={styles.flex1} contentContainerStyle={styles.p5}>
-                    <TextInputWithLabel
-                        label={this.props.translate('newRoomPage.roomName')}
-                        prefixCharacter="#"
-                        placeholder={this.props.translate('newRoomPage.social')}
-                        containerStyles={[styles.mb5]}
-                        onChangeText={roomName => this.setState({roomName: this.checkAndModifyRoomName(roomName)})}
-                        value={this.state.roomName.substr(1)}
-                        errorText={this.state.error}
-=======
                 <KeyboardAvoidingView>
                     <HeaderWithCloseButton
                         title={this.props.translate('newRoomPage.newRoom')}
                         onCloseButtonPress={() => Navigation.dismissModal()}
->>>>>>> e78742336 (Merge pull request #6951 from parasharrajat/room-page)
                     />
                     <ScrollView style={styles.flex1} contentContainerStyle={styles.p5}>
                         <TextInputWithLabel