From d8570a6ad0aa9103745cddf3e505e994dbbb4e85 Mon Sep 17 00:00:00 2001
From: SERNY Sacha <serny.s@example.com>
Date: Wed, 1 Dec 2021 18:24:19 +0100
Subject: [PATCH] bug git

---
 index.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/index.html b/index.html
index 2992be1..7567fdb 100644
--- a/index.html
+++ b/index.html
@@ -14,11 +14,8 @@
 	<header>
 		<h1><a class="_title" href="home.html"><span class="word1">Pop</span><span class="word3">Op</span></a></h1>
 		<ul>
-<<<<<<< HEAD
 			<li><a href="fun.html">Fun</a></li>
-=======
 			<li><a href="top.html">Top</a></li>
->>>>>>> d120872e658c0bb2df803f19a903096b4a6a7928
 			<li><a href="index.html">Musiques</a></li>
 			<li><a href="reading.html">Lectures</a></li>
 		</ul>