Skip to content

Commit 02446a3

Browse files
authored
Merge pull request #87 from CS3219-AY2425S1/Nephelite-patch-2
Fix Merge Conflict
2 parents ad47495 + b318307 commit 02446a3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

frontend/src/presentation/pages/CollaborationRoomPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ const CollaborationRoomPage: React.FC = () => {
8080
<ToggleButton showChat={showChat} onClick={() => setShowChat(!showChat)} />
8181
<div className={styles.contentArea}>
8282
<div className={`${styles.questionDetail} ${showChat ? styles.hidden : ""}`}>
83-
<QuestionDetail question={initialQuestions[0]} />
83+
<QuestionDetail question={question} />
8484
</div>
8585
<div className={`${styles.chatFrame} ${showChat ? styles.visible : styles.hidden}`}>
8686
<ChatFrame roomId={roomId} />

0 commit comments

Comments
 (0)