diff options
Diffstat (limited to 'about.html')
| -rw-r--r-- | about.html | 13 |
1 files changed, 0 insertions, 13 deletions
@@ -1,15 +1,11 @@ <!DOCTYPE HTML> <html> <head> -<<<<<<< HEAD <meta charset="unicode"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="description" content="The Weight of Comfort"> <meta name="keywords" content="Personal, Music, Poetry, Art, Radiohotline, Teethinvitro"> <meta name="author" content="Radiohotline"> -======= - <meta name="viewport" content="width=device-width, initial-scale=1.0"> ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff <link href="house.css" rel="stylesheet"> <title>Soft Machine | About</title> <style> @@ -72,18 +68,9 @@ <br> -<<<<<<< HEAD - <img src="img/stamps/gointhedark.gif" alt=""> - <img src="img/stamps/kafka.png" alt=""> - <img src="img/stamps/thog.png" alt=""> -======= - <img src="img/stamps/evilkittens.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/thog.png" alt=""> - <img src="img/stamps/wain.png" alt=""> ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff </div> |