diff options
| author | Radiohotline <radiohotline@disroot.org> | 2026-02-17 12:12:37 +0000 |
|---|---|---|
| committer | Radiohotline <radiohotline@disroot.org> | 2026-02-17 12:12:37 +0000 |
| commit | 223ef7acb24356fca6cf5ab40c02b43a09452093 (patch) | |
| tree | d845297a50e78f9ca9c37c113b78b8a2aaa1c138 /old/house.html | |
| parent | cae6b00e0f3352a323af2400bf7f9deb7460c7de (diff) | |
| parent | 37522616a3efcaa3c7b40821155e8f1fff5c9985 (diff) | |
about
Diffstat (limited to 'old/house.html')
| -rw-r--r-- | old/house.html | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/old/house.html b/old/house.html index c9eb24c..ae950eb 100644 --- a/old/house.html +++ b/old/house.html @@ -68,6 +68,7 @@ </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="">
@@ -88,6 +89,28 @@ <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>
|