|
|
@ -14,11 +14,8 @@ |
|
|
<header> |
|
|
<header> |
|
|
<h1><a class="_title" href="home.html"><span class="word1">Pop</span><span class="word3">Op</span></a></h1> |
|
|
<h1><a class="_title" href="home.html"><span class="word1">Pop</span><span class="word3">Op</span></a></h1> |
|
|
<ul> |
|
|
<ul> |
|
|
<<<<<<< HEAD |
|
|
|
|
|
<li><a href="fun.html">Fun</a></li> |
|
|
<li><a href="fun.html">Fun</a></li> |
|
|
======= |
|
|
|
|
|
<li><a href="top.html">Top</a></li> |
|
|
<li><a href="top.html">Top</a></li> |
|
|
>>>>>>> d120872e658c0bb2df803f19a903096b4a6a7928 |
|
|
|
|
|
<li><a href="index.html">Musiques</a></li> |
|
|
<li><a href="index.html">Musiques</a></li> |
|
|
<li><a href="reading.html">Lectures</a></li> |
|
|
<li><a href="reading.html">Lectures</a></li> |
|
|
</ul> |
|
|
</ul> |
|
|
|
