starnakin/42_ft_transcendence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i forgot one modification for merge

Browse Source
This commit is contained in:
Xamora 2024-04-27 09:00:08 +02:00
parent 8758e221cb
commit 0d522eeca3
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/static/js/views/tournament/TournamentPageView.js
View File

@ -163,15 +163,11 @@ export default class extends AbstractAuthenticatedView
</tbody>
</table>
<input type="button" id="button" value="Join tournament" disabled>
<<<<<<< HEAD
<textarea id="chat" rows="4" cols="50" readonly>
</textarea>
<br>
<svg id="tree" height="3000" width="3000">
</svg>
=======
<span id="display"></span>
<textarea id="chat" rows="4" cols="50" readonly>
</textarea>
>>>>>>> 55d29d5763f22f136d2b4bae6464463acb514a5c
`;
}
}