diff options
| author | radiohotline <radiohotline@disroot.org> | 2026-02-17 15:23:50 +0300 |
|---|---|---|
| committer | radiohotline <radiohotline@disroot.org> | 2026-02-17 15:23:50 +0300 |
| commit | 5024f0d9fcc8426c7c48a7ce0b4cc86485921bd8 (patch) | |
| tree | 5f1e3c6dffe7f94af4b1df2f780c59874776f069 /old/house.html | |
| parent | a714b280bf407287ba2367afe2648bbc62bfa021 (diff) | |
merge
Diffstat (limited to 'old/house.html')
| -rw-r--r-- | old/house.html | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/old/house.html b/old/house.html index ae950eb..c9eb24c 100644 --- a/old/house.html +++ b/old/house.html @@ -68,7 +68,6 @@ </div>
<div style="flex: 3; padding-left: 10px;">
<div class="blsq" style="padding: 5px;">
-<<<<<<< HEAD <img src="../img/buttons/apples.png" alt="">
<img src="../img/buttons/bestview.gif" alt="">
<img style="width:88px; height:31px;" src="../img/buttons/evil.gif" alt="">
@@ -89,28 +88,6 @@ <img style="width:88px; height:31px;" src="../img/buttons/furby.jpg" alt="">
<img style="width:88px; height:31px;" src="../img/buttons/templeos.png" alt="">
<img style="width:88px; height:31px;" src="../img/buttons/budgie.gif" alt="">
-======= - <img src="../img/buttons/apples.png" alt="">
- <img src="../img/buttons/bestview.gif" alt="">
- <img style="width:88px; height:31px;" src="../img/buttons/evil.gif" alt="">
- <a href="https://sitcomtheory.org/"><img style="width:88px; height:31px;" src="../img/buttons/sitcombutton.gif" alt="sitcomtheory.org"></a>
- <img src="../img/buttons/homestar.gif" alt="">
- <a href="https://wiredcollective.neocities.org/webring"><img src="https://wiredcollective.neocities.org/webringimages/wiredcollectivebutton.png" alt="WIRED COLLECTIVE WEBRING"></a>
- <img src="../img/buttons/sharewareplease.gif" alt="">
- <img src="../img/buttons/thirdimpact.png" alt="">
- <a href="https://publictransit.neocities.org/"><img src="../img/buttons/transit.gif" alt="publictransit.neocities.org"></a>
- <a href="https://dhmo.org/"><img style="width:88px; height:31px;" src="../img/buttons/dhmo.png" alt="dhmo.org"></a>
- <img style="width:88px; height:31px;" src="../img/buttons/void.gif" alt="">
- <img style="width:88px; height:31px;" src="../img/buttons/xenia.gif" alt="">
- <a href="https://theanarchistlibrary.org/special/index"><img style="width:88px; height:31px;" src="../img/buttons/anarchist_lib.png" alt="theanarchistlibrary.org"></a>
- <a href="https://archive.org"><img style="width:88px; height:31px;" src="../img/buttons/archive.gif" alt="archive.org"></a>
- <a href="https://zapatopi.net/treeoctopus/"><img style="width:88px; height:31px;" src="../img/buttons/treeoctopus.png" alt="zapatopi.net/treeoctopus"></a>
- <img style="width:88px; height:31px;" src="../img/buttons/urappin.png" alt="">
- <a href="https://crouton.net/"><img style="width:88px; height:31px;" src="../img/buttons/crouton.png" alt="crouton.net"></a>
- <img style="width:88px; height:31px;" src="../img/buttons/furby.jpg" alt="">
- <img style="width:88px; height:31px;" src="../img/buttons/templeos.png" alt="">
- <img style="width:88px; height:31px;" src="../img/buttons/budgie.gif" alt="">
->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff </div>
<p>
|