Obisidian vault auto-backup: 09-01-2026 14:20:32 on . 7 files edited

This commit is contained in:
Félix MARQUET
2026-01-09 14:20:32 +01:00
parent 94df340018
commit 071c90a35a
7 changed files with 133 additions and 17 deletions

2
ISEN/Web/TP/.gitignore vendored Normal file
View File

@@ -0,0 +1,2 @@
.idea
.idea/*

View File

@@ -0,0 +1,85 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Chat</title>
</head>
<body>
<header>
<h1>Chat en ligne</h1>
<nav>
<ul>
<li><a href="accueil.html">Accueil</a></li>
<li><a href="chat.html">Chat</a></li>
<li><a href="https://isen-nantes.fr" target="_blank"><img src="images/ISEN_Logo.png" alt="logo isen"></a></li>
</ul>
</nav>
</header>
<section>
<h2>Bienvenue dans le Chat en ligne des étudiants de l'ISEN</h2>
<div class="table">
<table>
<thead>
<tr>
<th>Jour</th>
<th>Horaires</th>
<th>Évènement</th>
<th colspan="4">Sites</th>
</tr>
<tr>
<th></th>
<th></th>
<th></th>
<th>Brest</th>
<th>Caen</th>
<th>Nantes</th>
<th>Rennes</th>
</tr>
</thead>
<tbody>
<tr>
<td>Lundi</td>
<td>17h - 19h</td>
<td>Réunion BDE</td>
<td>X</td>
<td>X</td>
<td>X</td>
<td>X</td>
</tr>
<tr>
<td>Mardi</td>
<td>10h - 12h</td>
<td>Réunion Club Robotique</td>
<td>X</td>
<td>X</td>
<td></td>
<td></td>
</tr>
<tr>
<td>Mercredi</td>
<td>11h - 13h</td>
<td>Réunion Club IA</td>
<td></td>
<td>X</td>
<td>X</td>
<td></td>
</tr>
<tr>
<td>Jeudi</td>
<td>10h - 12h</td>
<td>Réunion BDS</td>
<td></td>
<td></td>
<td></td>
<td>X</td>
</tr>
</tbody>
</table>
</div>
</section>
<footer>
<p>All content copyright &copy;A3</p>
<a href="http://isen-nantes.fr" target="_blank"><p>Lien vers la page du Programmeur</p></a>
</footer>
</body>
</html>

View File

@@ -0,0 +1,23 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Chat</title>
</head>
<body>
<header>
<h1>Chat en ligne</h1>
<nav>
<ul>
<li><a href="accueil.html">Accueil</a></li>
<li><a href="chat.html">Chat</a></li>
<li><a href="https://isen-nantes.fr" target="_blank"><img src="images/ISEN_Logo.png" alt="logo isen"></a></li>
</ul>
</nav>
</header>
<footer>
<p>All content copyright &copy;A3</p>
<a href="http://isen-nantes.fr" target="_blank"><p>Lien vers la page du Programmeur</p></a>
</footer>
</body>
</html>

23
ISEN/Web/TP/TP1/chat.html Normal file
View File

@@ -0,0 +1,23 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Chat</title>
</head>
<body>
<header>
<h1>Chat en ligne</h1>
<nav>
<ul>
<li><a href="accueil.html">Accueil</a></li>
<li><a href="chat.html">Chat</a></li>
<li><a href="https://isen-nantes.fr" target="_blank"><img src="images/ISEN_Logo.png" alt="logo isen"></a></li>
</ul>
</nav>
</header>
<footer>
<p>All content copyright &copy;A3</p>
<a href="http://isen-nantes.fr" target="_blank"><p>Lien vers la page du Programmeur</p></a>
</footer>
</body>
</html>

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

BIN
ISEN/Web/TP/TP1/tp1.pdf Normal file

Binary file not shown.

View File

@@ -1,17 +0,0 @@
# Conflicts
Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push`
(This file will automatically be deleted before commit)
[[#Additional Instructions]] available below file list
- Not a file: .obsidian/workspace.json
# Additional Instructions
I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text.
```diff
<<<<<<< HEAD
File changes in local repository
=======
File changes in remote repository
>>>>>>> origin/main
```