diff options
| author | Paul Buetow <paul@buetow.org> | 2025-02-21 11:12:53 +0200 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2025-02-21 11:12:53 +0200 |
| commit | e43cb338bf704f1b50cc89c8efbfa5ac0f19932e (patch) | |
| tree | 53c414720564867fde69acfe9d01212f43a7fa8a /index.html | |
| parent | 76f252524871b203ac11279511ea0adcf8b1386c (diff) | |
| parent | b9abc29d0593a4d65919a80cdc0978dc881eb2f1 (diff) | |
conflicts
Diffstat (limited to 'index.html')
| -rw-r--r-- | index.html | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -13,7 +13,11 @@ </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 <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 /> |