uh

hg
2022-12-22 13:56:15 +01:00 · 2022-12-22 13:55:16 +01:00
--- a/where_to_go.html
+++ b/where_to_go.html
@ -11,7 +11,10 @@
            <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>
作者	SHA1	備註	日期
georgia	279c79779f	uh	2022-12-22 13:56:15 +01:00
georgia	5c16cbc1f6	hg	2022-12-22 13:55:16 +01:00