summaryrefslogtreecommitdiff
path: root/index.html
diff options
context:
space:
mode:
Diffstat (limited to 'index.html')
-rw-r--r--index.html6
1 files changed, 1 insertions, 5 deletions
diff --git a/index.html b/index.html
index d32a4636..74643e70 100644
--- a/index.html
+++ b/index.html
@@ -13,11 +13,7 @@
</p>
<h1 style='display: inline' id='foozone'>foo.zone</h1><br />
<br />
-<<<<<<< HEAD
-<span class='quote'>This site was generated at 2025-02-21T11:07:02+02:00 by <span class='inlinecode'>Gemtexter</span></span><br />
-=======
-<span class='quote'>This site was generated at 2025-02-16T11:18:30+02:00 by <span class='inlinecode'>Gemtexter</span></span><br />
->>>>>>> b9abc29d0593a4d65919a80cdc0978dc881eb2f1
+<span class='quote'>This site was generated at 2025-02-21T11:13:28+02:00 by <span class='inlinecode'>Gemtexter</span></span><br />
<br />
<span>Welcome to the foo.zone. Everything you read on this site is my personal opinion and experience. You can call me a Linux/*BSD enthusiast and hobbyist. I mainly write about tech, IT, programming and sometimes also about self-improvement here. And I also like coding.</span><br />
<br />