diff options
Diffstat (limited to 'old/books.html')
| -rw-r--r-- | old/books.html | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/old/books.html b/old/books.html index 2f8679d..968453c 100644 --- a/old/books.html +++ b/old/books.html @@ -72,7 +72,6 @@ <div style="padding-left: 30px;"> <h3>Favourite books<sup>2</sup></h3> <div class="flex"> -<<<<<<< HEAD <img src="../img/lib/hol.jpeg" alt="House of Leaves - Mark Z. Danielewski"> <img src="../img/lib/necro.jpg" alt="The Necrophiliac - Gabrielle Wittkop"> <img src="../img/lib/acwo.jpg" alt="A Clockwork Orange - Anthony Burgess"> @@ -89,39 +88,10 @@ <img src="../img/lib/girl.jpeg" alt="Girl on the Shore - Inio Asano"> <img src="../img/lib/child.jpg" alt="Child of God - Kyoudai Nishioka"> <img src="../img/lib/claudine.jpg" alt="Claudine - Ryoko Ikeda"> -======= - <img src="../img/lib/hol.jpeg" alt="House of Leaves - Mark Z. Danielewski"> - <img src="../img/lib/necro.jpg" alt="The Necrophiliac - Gabrielle Wittkop"> - <img src="../img/lib/acwo.jpg" alt="A Clockwork Orange - Anthony Burgess"> - <img src="../img/lib/naked.jpg" alt="Naked Lunch - William S. Burroughs"> - <img src="../img/lib/448.jpg" alt="4.48 Psychosis - Sarah Kane"> - <img src="../img/lib/baby.jpg" alt="Babyfucker - Urs Allemann"> - <img src="../img/lib/stranger.jpg" alt="The Stranger - Albert Camus"> - <img src="../img/lib/alice.jpg" alt="Alice's Adventures in Wonderland - Lewis Carroll"> - <img src="../img/lib/perfume.jpg" alt="Perfume: The Story of a Murderer - Patrick Süskind"> - <img src="../img/lib/snake.jpg" alt="The Man Who Spoke Snakish - Andrus Kivirähk"> - <img src="../img/lib/forgive.jpg" alt="Forgive Me, Leonard Peacock - Matthew Quick"> - <img src="../img/lib/trans.jpg" alt="Enlightened Transsexual Comix - Sam Szabo"> - <img src="../img/lib/punpun.jpg" alt="Oyasumi Punpun - Inio Asano"> - <img src="../img/lib/girl.jpeg" alt="Girl on the Shore - Inio Asano"> - <img src="../img/lib/child.jpg" alt="Child of God - Kyoudai Nishioka"> - <img src="../img/lib/claudine.jpg" alt="Claudine - Ryoko Ikeda"> ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff </div> <hr> <h3>Favourite films</h3> <div class="flex"> -<<<<<<< HEAD - <img src="../img/film/angel.jpg" alt="Angel's Egg (1985)"> - <img src="../img/film/clock.jpg" alt="A Clockwork Orange (1971)"> - <img src="../img/film/martin.jpg" alt="Martin (1977)"> - <img src="../img/film/dancer.jpg" alt="Dancer in the Dark (2000)"> - <img src="../img/film/if.jpg" alt="If.... (1968)"> - <img src="../img/film/maude.jpg" alt="Harold and Maude (1971)"> - <img src="../img/film/planet.jpg" alt="La Planet Sauvage (1973)"> - <img src="../img/film/little.jpg" alt="Little Miss Sunshine (2006)"> - <img src="../img/film/theblacktower.jpg" alt="The Black Tower (1987)"> -======= <img src="../img/film/angel.jpg" alt="Angel's Egg (1985)"> <img src="../img/film/clock.jpg" alt="A Clockwork Orange (1971)"> <img src="../img/film/martin.jpg" alt="Martin (1977)"> @@ -131,7 +101,6 @@ <img src="../img/film/planet.jpg" alt="La Planet Sauvage (1973)"> <img src="../img/film/little.jpg" alt="Little Miss Sunshine (2006)"> <img src="../img/film/theblacktower.jpg" alt="The Black Tower (1987)"> ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff </div> </div> </div> |