Vertaa committeja
2 commits
dcb9e092b0
...
279c79779f
Tekijä | SHA1 | Päivämäärä | |
---|---|---|---|
279c79779f | |||
5c16cbc1f6 |
1 muutettua tiedostoa jossa 3 lisäystä ja 0 poistoa
|
@ -11,7 +11,10 @@
|
||||||
<a href = "main.html">Main Page</a>
|
<a href = "main.html">Main Page</a>
|
||||||
<a href = "where_to_go.html">Where To Go</a>
|
<a href = "where_to_go.html">Where To Go</a>
|
||||||
<a href = "history_mythology.html">History and Mythology</a>
|
<a href = "history_mythology.html">History and Mythology</a>
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
<a href = "history_mythology.html">History</a>
|
<a href = "history_mythology.html">History</a>
|
||||||
|
>>>>>>> dcb9e092b0a387daf99d10ef8f485deb7b5c7300
|
||||||
<a href = "food_lifestyle.html">Food and Lifestyle</a>
|
<a href = "food_lifestyle.html">Food and Lifestyle</a>
|
||||||
<a href = "faq.html">Frequently Asked Questions</a>
|
<a href = "faq.html">Frequently Asked Questions</a>
|
||||||
</nav>
|
</nav>
|
||||||
|
|
Ladataan…
Viittaa uudesa ongelmassa