merge

_layouts/home.html

@@ -35,7 +35,7 @@
             
         <p>If you want to get in touch, look at the <a href="contact.html">contact</a> page! You can find me on plenty of websites or just send me an email – I am always happy to talk to new people! I don’t usually bite. Unless you want me to >:3</p>
 
-        <p>This website is still very much a work-in-progress and it was last updated: {{ 'now' | date: "%-d %B %Y"}}. I will be adding a <a href="blog.html">blog</a> at some point where I will be posting things mostly about computers, games and birds (<i>who’d’ve thunk?</i>).</p>
+        <p>This website is still very much a work-in-progress and it was last updated: {{ 'now' | date: "%-d %B %Y"}}. I also have a <a href="blog.html">blog</a> where I will be posting things mostly about computers, games and birds (<i>who’d’ve thunk?</i>).</p>
         
         <p>You can also find me on <a href="https://bateleur.org">bateleur.org</a>. At the moment, it is simply a mirror of hexaitos.com but hosted entirely at home. Additionally, you can find me on Gemini as well. Just go to <a href="gemini://terathopius.com">gemini://terathopius.com</a> or to <a href="https://terathopius.com">https://terathopius.com</a> for an HTTPS proxy of my Gemini capsule. I also have my own Gitea instance over on <a href="https://git.bateleur.org">git.bateleur.org</a>.</p>
     </div>

_site/index.html

@@ -41,7 +41,11 @@
             
         <p>If you want to get in touch, look at the <a href="contact.html">contact</a> page! You can find me on plenty of websites or just send me an email – I am always happy to talk to new people! I don’t usually bite. Unless you want me to >:3</p>
 
+<<<<<<< HEAD
         <p>This website is still very much a work-in-progress and it was last updated: 2 November 2024. I will be adding a <a href="blog.html">blog</a> at some point where I will be posting things mostly about computers, games and birds (<i>who’d’ve thunk?</i>).</p>
+=======
+        <p>This website is still very much a work-in-progress and it was last updated: 1 November 2024. I also have a <a href="blog.html">blog</a> where I will be posting things mostly about computers, games and birds (<i>who’d’ve thunk?</i>).</p>
+>>>>>>> 2f1818e11c5d96d65d8fb1acf0faa83cba1d02f3
         
         <p>You can also find me on <a href="https://bateleur.org">bateleur.org</a>. At the moment, it is simply a mirror of hexaitos.com but hosted entirely at home. Additionally, you can find me on Gemini as well. Just go to <a href="gemini://terathopius.com">gemini://terathopius.com</a> or to <a href="https://terathopius.com">https://terathopius.com</a> for an HTTPS proxy of my Gemini capsule. I also have my own Gitea instance over on <a href="https://git.bateleur.org">git.bateleur.org</a>.</p>
     </div>

_site/sitemap.xml

@@ -4,7 +4,11 @@
   <url>
     <loc>https://hexaitos.com/art.html</loc>
     
+<<<<<<< HEAD
       <lastmod>2024-11-02T19:10:38+01:00</lastmod>
+=======
+      <lastmod>2024-11-01T10:58:24+01:00</lastmod>
+>>>>>>> 2f1818e11c5d96d65d8fb1acf0faa83cba1d02f3
     
     <changefreq>monthly</changefreq>
     <priority>0.3</priority>
@@ -13,7 +17,11 @@
   <url>
     <loc>https://hexaitos.com/blog.html</loc>
     
+<<<<<<< HEAD
       <lastmod>2024-11-02T19:10:38+01:00</lastmod>
+=======
+      <lastmod>2024-11-01T10:58:24+01:00</lastmod>
+>>>>>>> 2f1818e11c5d96d65d8fb1acf0faa83cba1d02f3
     
     <changefreq>monthly</changefreq>
     <priority>0.3</priority>
@@ -22,7 +30,11 @@
   <url>
     <loc>https://hexaitos.com/contact.html</loc>
     
+<<<<<<< HEAD
       <lastmod>2024-11-02T19:10:38+01:00</lastmod>
+=======
+      <lastmod>2024-11-01T10:58:24+01:00</lastmod>
+>>>>>>> 2f1818e11c5d96d65d8fb1acf0faa83cba1d02f3
     
     <changefreq>monthly</changefreq>
     <priority>0.3</priority>
@@ -31,7 +43,11 @@
   <url>
     <loc>https://hexaitos.com/</loc>
     
+<<<<<<< HEAD
       <lastmod>2024-11-02T19:10:38+01:00</lastmod>
+=======
+      <lastmod>2024-11-01T10:58:24+01:00</lastmod>
+>>>>>>> 2f1818e11c5d96d65d8fb1acf0faa83cba1d02f3
     
     <changefreq>monthly</changefreq>
     <priority>0.3</priority>
@@ -40,7 +56,11 @@
   <url>
     <loc>https://hexaitos.com/refsheet.html</loc>
     
+<<<<<<< HEAD
       <lastmod>2024-11-02T19:10:38+01:00</lastmod>
+=======
+      <lastmod>2024-11-01T10:58:24+01:00</lastmod>
+>>>>>>> 2f1818e11c5d96d65d8fb1acf0faa83cba1d02f3
     
     <changefreq>monthly</changefreq>
     <priority>0.3</priority>
@@ -49,7 +69,11 @@
   <url>
     <loc>https://hexaitos.com/sitemap.xml</loc>
     
+<<<<<<< HEAD
       <lastmod>2024-11-02T19:10:38+01:00</lastmod>
+=======
+      <lastmod>2024-11-01T10:58:24+01:00</lastmod>
+>>>>>>> 2f1818e11c5d96d65d8fb1acf0faa83cba1d02f3
     
     <changefreq>monthly</changefreq>
     <priority>0.3</priority>