We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent d498535 commit 1309db6Copy full SHA for 1309db6
1 file changed
src/app/features/room/Room.tsx
@@ -15,12 +15,9 @@ import { useRoomMembers } from '$hooks/useRoomMembers';
15
import { CallView } from '$features/call/CallView';
16
import { WidgetsDrawer } from '$features/widgets/WidgetsDrawer';
17
import { callChatAtom } from '$state/callEmbed';
18
-<<<<<<< feat/threads
19
import { roomIdToOpenThreadAtomFamily } from '$state/room/roomToOpenThread';
20
import { roomIdToThreadBrowserAtomFamily } from '$state/room/roomToThreadBrowser';
21
-=======
22
import { createDebugLogger } from '$utils/debugLogger';
23
->>>>>>> dev
24
import { RoomViewHeader } from './RoomViewHeader';
25
import { MembersDrawer } from './MembersDrawer';
26
import { RoomView } from './RoomView';
0 commit comments