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

Compare commits

base: rees:dcb9e092b0a387daf99d10ef8f485deb7b5c7300
Branches Tags
rees:master
rees:testModification1
..
compare: rees:7414789a9be3e00ad5959a8ebcc6e871c769bf2a
Branches Tags
rees:master
rees:testModification1

No commits in common. "dcb9e092b0a387daf99d10ef8f485deb7b5c7300" and "7414789a9be3e00ad5959a8ebcc6e871c769bf2a" have entirely different histories.
dcb9e092b0 ... 7414789a9b

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

1
faq.html
View file

@ -5,7 +5,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>FAQ</title>
<link rel="stylesheet" href="css/text.css">
</head>
<body>
<header>

3
where_to_go.html
View file

@ -10,8 +10,11 @@
<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>