diff options
Diffstat (limited to 'old/about.html')
| -rw-r--r-- | old/about.html | 70 |
1 files changed, 50 insertions, 20 deletions
diff --git a/old/about.html b/old/about.html index b05f042..c0ee1da 100644 --- a/old/about.html +++ b/old/about.html @@ -54,7 +54,11 @@ </p>
<p>
<sup>2</sup>
+<<<<<<< HEAD <img src=img/teethinvitro.gif alt="Site button">
+======= + <img src=../img/teethinvitro.gif alt="Site button">
+>>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff </p>
</div>
@@ -72,29 +76,55 @@ <br><br>
<div id="buttons" style="text-align: center; padding-left: 40px; padding-right: 40px;">
- <img src="img/blinkies/am.gif" alt="">
- <img src="img/blinkies/bloodsucker.gif" alt="">
- <img src="img/blinkies/figment.gif" alt="">
- <img src="img/blinkies/fragile.gif" alt="">
+<<<<<<< HEAD + <img src="../img/blinkies/am.gif" alt="">
+ <img src="../img/blinkies/bloodsucker.gif" alt="">
+ <img src="../img/blinkies/figment.gif" alt="">
+ <img src="../img/blinkies/fragile.gif" alt="">
<br>
- <img src="img/blinkies/happy.gif" alt="">
- <img src="img/blinkies/malpractice.gif" alt="">
- <img src="img/blinkies/ohworm.gif" alt="">
- <img src="img/blinkies/wug.gif" alt="">
+ <img src="../img/blinkies/happy.gif" alt="">
+ <img src="../img/blinkies/malpractice.gif" alt="">
+ <img src="../img/blinkies/ohworm.gif" alt="">
+ <img src="../img/blinkies/wug.gif" alt="">
<br>
- <img src="img/stamps/5g.png" alt="">
- <img style="width:99px; height:56px;" src="img/stamps/aotk.png" alt="">
- <img src="img/stamps/bjork.gif" alt="">
- <img src="img/stamps/cats.png" alt="">
- <img src="img/stamps/citation.jpg" alt="">
- <img src="img/stamps/evilkittens.png" alt="">
+ <img src="../img/stamps/5g.png" alt="">
+ <img style="width:99px; height:56px;" src="../img/stamps/aotk.png" alt="">
+ <img src="../img/stamps/bjork.gif" alt="">
+ <img src="../img/stamps/cats.png" alt="">
+ <img src="../img/stamps/citation.jpg" alt="">
+ <img src="../img/stamps/evilkittens.png" alt="">
<br>
- <img src="img/stamps/gointhedark.gif" alt="">
- <img src="img/stamps/kafka.png" alt="">
- <img src="img/stamps/orchid.png" alt="">
- <img src="img/stamps/ranfren.gif" alt="">
- <img src="img/stamps/thog.png" alt="">
- <img src="img/stamps/wain.png" alt="">
+ <img src="../img/stamps/gointhedark.gif" alt="">
+ <img src="../img/stamps/kafka.png" alt="">
+ <img src="../img/stamps/orchid.png" alt="">
+ <img src="../img/stamps/ranfren.gif" alt="">
+ <img src="../img/stamps/thog.png" alt="">
+ <img src="../img/stamps/wain.png" alt="">
+======= + <img src="../img/blinkies/am.gif" alt="">
+ <img src="../img/blinkies/bloodsucker.gif" alt="">
+ <img src="../img/blinkies/figment.gif" alt="">
+ <img src="../img/blinkies/fragile.gif" alt="">
+ <br>
+ <img src="../img/blinkies/happy.gif" alt="">
+ <img src="../img/blinkies/malpractice.gif" alt="">
+ <img src="../img/blinkies/ohworm.gif" alt="">
+ <img src="../img/blinkies/wug.gif" alt="">
+ <br>
+ <img src="../img/stamps/5g.png" alt="">
+ <img style="width:99px; height:56px;" src="../img/stamps/aotk.png" alt="">
+ <img src="../img/stamps/bjork.gif" alt="">
+ <img src="../img/stamps/cats.png" alt="">
+ <img src="../img/stamps/citation.jpg" alt="">
+ <img src="../img/stamps/evilkittens.png" alt="">
+ <br>
+ <img src="../img/stamps/gointhedark.gif" alt="">
+ <img src="../img/stamps/kafka.png" alt="">
+ <img src="../img/stamps/orchid.png" alt="">
+ <img src="../img/stamps/ranfren.gif" alt="">
+ <img src="../img/stamps/thog.png" alt="">
+ <img src="../img/stamps/wain.png" alt="">
+>>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff </div>
</div>
</div>
|