update

2024-10-01 21:31:56 +02:00
parent 2e133231da 3e8bc60712
commit 1437857fbc
4 changed files with 91 additions and 107 deletions
--- a/docker-compose/requirements/nginx/static/javascript/lobbyPage/main.js
+++ b/docker-compose/requirements/nginx/static/javascript/lobbyPage/main.js
@ -3,10 +3,14 @@
 /*                                                        :::      ::::::::   */
 /*   main.js                                            :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
+/*   By: hubourge <hubourge@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/22 17:08:46 by madegryc          #+#    #+#             */
+<<<<<<< HEAD
 /*   Updated: 2024/10/01 16:46:24 by edbernar         ###   ########.fr       */
+=======
+/*   Updated: 2024/10/01 18:48:13 by hubourge         ###   ########.fr       */
+>>>>>>> 3e8bc6071273411d12af866d58550eddebba89ec
 /*                                                                            */
 /* ************************************************************************** */