diff --git a/_layouts/home.html b/_layouts/home.html index 416d5ea..3677045 100755 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -35,7 +35,7 @@

If you want to get in touch, look at the contact 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

-

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 blog at some point where I will be posting things mostly about computers, games and birds (who’d’ve thunk?).

+

This website is still very much a work-in-progress and it was last updated: {{ 'now' | date: "%-d %B %Y"}}. I also have a blog where I will be posting things mostly about computers, games and birds (who’d’ve thunk?).

You can also find me on bateleur.org. 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 gemini://terathopius.com or to https://terathopius.com for an HTTPS proxy of my Gemini capsule. I also have my own Gitea instance over on git.bateleur.org.

diff --git a/_site/index.html b/_site/index.html index 87c255f..e138245 100755 --- a/_site/index.html +++ b/_site/index.html @@ -41,7 +41,11 @@

If you want to get in touch, look at the contact 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

+<<<<<<< HEAD

This website is still very much a work-in-progress and it was last updated: 2 November 2024. I will be adding a blog at some point where I will be posting things mostly about computers, games and birds (who’d’ve thunk?).

+======= +

This website is still very much a work-in-progress and it was last updated: 1 November 2024. I also have a blog where I will be posting things mostly about computers, games and birds (who’d’ve thunk?).

+>>>>>>> 2f1818e11c5d96d65d8fb1acf0faa83cba1d02f3

You can also find me on bateleur.org. 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 gemini://terathopius.com or to https://terathopius.com for an HTTPS proxy of my Gemini capsule. I also have my own Gitea instance over on git.bateleur.org.

diff --git a/_site/sitemap.xml b/_site/sitemap.xml index e89532a..f023e4a 100755 --- a/_site/sitemap.xml +++ b/_site/sitemap.xml @@ -4,7 +4,11 @@ https://hexaitos.com/art.html +<<<<<<< HEAD 2024-11-02T19:10:38+01:00 +======= + 2024-11-01T10:58:24+01:00 +>>>>>>> 2f1818e11c5d96d65d8fb1acf0faa83cba1d02f3 monthly 0.3 @@ -13,7 +17,11 @@ https://hexaitos.com/blog.html +<<<<<<< HEAD 2024-11-02T19:10:38+01:00 +======= + 2024-11-01T10:58:24+01:00 +>>>>>>> 2f1818e11c5d96d65d8fb1acf0faa83cba1d02f3 monthly 0.3 @@ -22,7 +30,11 @@ https://hexaitos.com/contact.html +<<<<<<< HEAD 2024-11-02T19:10:38+01:00 +======= + 2024-11-01T10:58:24+01:00 +>>>>>>> 2f1818e11c5d96d65d8fb1acf0faa83cba1d02f3 monthly 0.3 @@ -31,7 +43,11 @@ https://hexaitos.com/ +<<<<<<< HEAD 2024-11-02T19:10:38+01:00 +======= + 2024-11-01T10:58:24+01:00 +>>>>>>> 2f1818e11c5d96d65d8fb1acf0faa83cba1d02f3 monthly 0.3 @@ -40,7 +56,11 @@ https://hexaitos.com/refsheet.html +<<<<<<< HEAD 2024-11-02T19:10:38+01:00 +======= + 2024-11-01T10:58:24+01:00 +>>>>>>> 2f1818e11c5d96d65d8fb1acf0faa83cba1d02f3 monthly 0.3 @@ -49,7 +69,11 @@ https://hexaitos.com/sitemap.xml +<<<<<<< HEAD 2024-11-02T19:10:38+01:00 +======= + 2024-11-01T10:58:24+01:00 +>>>>>>> 2f1818e11c5d96d65d8fb1acf0faa83cba1d02f3 monthly 0.3