From 706a3577c9135e3d09ac5a95ea3afe8833dd93c8 Mon Sep 17 00:00:00 2001
From: Brendan Webb <brendan3840@gmail.com>
Date: Thu, 25 Nov 2021 19:57:53 +1100
Subject: [PATCH] attempt to merge fixes

---
 index.html                              |  3 ++
 phonebook/index.html                    | 10 ++++
 the-original/20210120-rip-tilde-tel.txt | 68 ++++++++++++-------------
 3 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/index.html b/index.html
index 7a81591..7df4eb5 100644
--- a/index.html
+++ b/index.html
@@ -8,7 +8,10 @@ layout: base
 	<ul class="inline-list">
 		<li><a href="/phonebook/">phonebook</a></li>
 		<li><a href="/the-original/">the original</a></li>
+<<<<<<< HEAD
 <<<<<<< HEAD
 		<li><a href="https://tel.tilde.org.nz/register/">request account</a></li>
+=======
+>>>>>>> Revert "add "register" link to the homepage"
 	</ul>
 </main>
diff --git a/phonebook/index.html b/phonebook/index.html
index 0e201a7..b1c83ed 100644
--- a/phonebook/index.html
+++ b/phonebook/index.html
@@ -27,10 +27,20 @@ title: phonebook
 	<h2>The community</h2>
 
 	<p>
+<<<<<<< HEAD
 		Want a <code>tel.tilde.org.nz</code> number?
 		<a href="https://tel.tilde.org.nz/register/">
 			Click here for the registration form!
 		</a>
+=======
+		To get a <code>tel.tilde.org.nz</code> number, please message <code>darcy</code>
+		in <code>#tildetel</code> on <a href="https://tilde.chat">the tilde.chat IRC</a>.
+	</p>
+	<p>
+		If you had a <code>tilde.tel</code> number, in most cases, you can use that number
+		on <code>tel.tilde.org.nz</code>! Just let <code>darcy</code> know when asking for
+		an account.
+>>>>>>> Revert "add "register" link to the homepage"
 	</p>
 
 	<table>
diff --git a/the-original/20210120-rip-tilde-tel.txt b/the-original/20210120-rip-tilde-tel.txt
index 5a6d1ad..ca6eb76 100644
--- a/the-original/20210120-rip-tilde-tel.txt
+++ b/the-original/20210120-rip-tilde-tel.txt
@@ -1,34 +1,34 @@
-----------------------------------------
-rip tilde.tel
-January 20th, 2021
-----------------------------------------
-
-yesterday, the almighty tilde.tel was shuttered.
-
-not gonna lie, by the time i found out, i was quite saddened.
-dammit, cat! now i've gotta go delete all my softphones! :p
-
-in all seriousness, despite its deadness, it was fun while it
-lasted.
-
-
-rest in peace, tilde.tel.
-
-
-
-     ------
-   /        \
-  /    RIP   \ 
- /            \
-|  TILDE.TEL   |
-|              |
-|  2019-2021   |
-|              |
-|  "ring ring, |
-|   mother-    |
-|   fucker."   |
-|              |
-----------------
-
-
-
+----------------------------------------
+rip tilde.tel
+January 20th, 2021
+----------------------------------------
+
+yesterday, the almighty tilde.tel[1] was shuttered.
+
+not gonna lie, by the time i found out, i was quite saddened.
+dammit, cat! now i've gotta go delete all my softphones! :p
+
+in all seriousness, despite its deadness, it was fun while it
+lasted.
+
+
+rest in peace, tilde.tel.
+
+
+
+     ------
+   /        \
+  /    RIP   \ 
+ /            \
+|  TILDE.TEL   |
+|              |
+|  2019-2021   |
+|              |
+|  "ring ring, |
+|   mother-    |
+|   fucker."   |
+|              |
+----------------
+
+
+