From 5c16cbc1f60ece7ff4fd8c441f199c8167795686 Mon Sep 17 00:00:00 2001
From: georgia <koutsodi@insa-toulouse.fr>
Date: Thu, 22 Dec 2022 13:55:16 +0100
Subject: [PATCH 1/2] hg

---
 where_to_go.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/where_to_go.html b/where_to_go.html
index 837025d..efedb18 100644
--- a/where_to_go.html
+++ b/where_to_go.html
@@ -10,11 +10,7 @@
         <nav class="B">
             <a href = "main.html">Main Page</a>
             <a href = "where_to_go.html">Where To Go</a>
-<<<<<<< HEAD
             <a href = "history_mythology.html">History and Mythology</a>
-=======
-            <a href = "history_mythology.html">History</a>
->>>>>>> 7b55c056e680e35408f53eb448d6cd0881856a11
             <a href = "food_lifestyle.html">Food and Lifestyle</a>
             <a href = "faq.html">Frequently Asked Questions</a>
 </nav>

From e50e4768897a8059ff041e5a0063346d1ce089c6 Mon Sep 17 00:00:00 2001
From: georgia <koutsodi@insa-toulouse.fr>
Date: Thu, 22 Dec 2022 13:57:29 +0100
Subject: [PATCH 2/2] njn

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

diff --git a/where_to_go.html b/where_to_go.html
index 6ded4ac..2750d44 100644
--- a/where_to_go.html
+++ b/where_to_go.html
@@ -11,10 +11,7 @@
             <a href = "main.html">Main Page</a>
             <a href = "where_to_go.html">Where To Go</a>
             <a href = "history_mythology.html">History and Mythology</a>
-<<<<<<< HEAD
-=======
             <a href = "history_mythology.html">History</a>
->>>>>>> dcb9e092b0a387daf99d10ef8f485deb7b5c7300
             <a href = "food_lifestyle.html">Food and Lifestyle</a>
             <a href = "faq.html">Frequently Asked Questions</a>
 </nav>