summaryrefslogtreecommitdiff
path: root/index.md
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2025-02-21 11:13:25 +0200
committerPaul Buetow <paul@buetow.org>2025-02-21 11:13:25 +0200
commit004379e798d56b85afda6fb63300a184e2e4bbca (patch)
treefeef03509dadc20cc0c182fe33b9fea6794119d4 /index.md
parentc3ff6863f3e81a31ea6aef13c27291af832382d5 (diff)
parent25ccc92b78135a5e494b170b65329e2b88b10815 (diff)
conflicts
Diffstat (limited to 'index.md')
-rw-r--r--index.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/index.md b/index.md
index e8b06a34..d3295a6e 100644
--- a/index.md
+++ b/index.md
@@ -1,6 +1,10 @@
# foo.zone
+<<<<<<< HEAD
> This site was generated at 2025-02-21T11:07:02+02:00 by `Gemtexter`
+=======
+> This site was generated at 2025-02-16T11:18:30+02:00 by `Gemtexter`
+>>>>>>> 25ccc92b78135a5e494b170b65329e2b88b10815
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.