rees/progWeb
0
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Compare commits

base: rees:279c79779f367cb4394192d7df4af060ba09025d
Branches Tags
rees:master
rees:testModification1
..
compare: rees:dcb9e092b0a387daf99d10ef8f485deb7b5c7300
Branches Tags
rees:master
rees:testModification1

No commits in common. "279c79779f367cb4394192d7df4af060ba09025d" and "dcb9e092b0a387daf99d10ef8f485deb7b5c7300" have entirely different histories.
279c79779f ... dcb9e092b0

1 changed files with 0 additions and 3 deletions
Show stats Expand all files Collapse all files

3
where_to_go.html
View file

@ -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>