Skip to content

Commit 815c2c5

Browse files
committed
Fix bad merge conflict resolution
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
1 parent f72f7ec commit 815c2c5

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

src/components/views/dialogs/RoomSettingsDialog.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ class RoomSettingsDialog extends React.Component<IProps, IState> {
191191
<NotificationSettingsTab
192192
roomId={this.state.room.roomId}
193193
closeSettingsFn={() => this.props.onFinished(true)}
194-
/>
194+
/>,
195195
"RoomSettingsNotifications",
196196
),
197197
);

0 commit comments

Comments
 (0)