done meging

3 files changed, 10 insertions, 2 deletions

diff --git a/gemfeed/2022-01-23-welcome-to-the-foo.zone.gmi b/gemfeed/2022-01-23-welcome-to-the-foo.zone.gmi
index f9ee00c8..be5727a4 100644
--- a/gemfeed/2022-01-23-welcome-to-the-foo.zone.gmi
+++ b/gemfeed/2022-01-23-welcome-to-the-foo.zone.gmi
@@ -19,7 +19,7 @@ As you can read on Wikipedia, "foo" is, alongside to "bar" and "baz", a metasynt
 
 ## What is the foo zone?
 
-It's my personal internet site and blog. Everything you read of this site are my personal opinions and experiences and projects. It's not intended to be anything professional. If you want my professional background, then go to my LinkedIn profile.
+It's my personal internet site and blog. Everything you read on this site is my personal opinion and experience. It's not intended to be anything professional. If you want my professional background, then go to my LinkedIn profile.
 
 Since I re-booted this blog last year, I struggled to find a good host name for it. I started off with "buetow.org", and later I switched halfway to "snonux.de". Buetow is my last name, and snonux relates to some of my internet nicknames and personal IT projects. I also have a "SnonuxBSD" ASCII-art banner in the motd of my FreeBSD based home-NAS.
 
diff --git a/gemfeed/atom.xml b/gemfeed/atom.xml
index 5655c9e6..1b033928 100644
--- a/gemfeed/atom.xml
+++ b/gemfeed/atom.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
+<<<<<<< HEAD
     <updated>2022-01-23T22:18:35+00:00</updated>
+=======
+    <updated>2022-01-23T20:26:34+00:00</updated>
+>>>>>>> dad79613387a86bd7c45f21e463a15396d775308
     <title>foo.zone feed</title>
     <subtitle>To be in the .zone!</subtitle>
     <link href="gemini://foo.zone/gemfeed/atom.xml" rel="self" />
@@ -32,7 +36,7 @@
 <p>As you can read on Wikipedia, "foo" is, alongside to "bar" and "baz", a metasyntactic variable (you know what I mean if you are a programmer or IT person):</p>
 <a class="textlink" href="https://en.wikipedia.org/wiki/Metasyntactic_variable">https://en.wikipedia.org/wiki/Metasyntactic_variable</a><br />
 <h2>What is the foo zone?</h2>
-<p>It's my personal internet site and blog. Everything you read of this site are my personal opinions and experiences and projects. It's not intended to be anything professional. If you want my professional background, then go to my LinkedIn profile.</p>
+<p>It's my personal internet site and blog. Everything you read on this site is my personal opinion and experience. It's not intended to be anything professional. If you want my professional background, then go to my LinkedIn profile.</p>
 <p>Since I re-booted this blog last year, I struggled to find a good host name for it. I started off with "buetow.org", and later I switched halfway to "snonux.de". Buetow is my last name, and snonux relates to some of my internet nicknames and personal IT projects. I also have a "SnonuxBSD" ASCII-art banner in the motd of my FreeBSD based home-NAS.</p>
 <p>For a while, I was thinking about a better host name for this site, meeting the following criteria:</p>
 <ul>
diff --git a/gemfeed/index.gmi b/gemfeed/index.gmi
index 67b7730d..edcde2c1 100644
--- a/gemfeed/index.gmi
+++ b/gemfeed/index.gmi
@@ -2,7 +2,11 @@
 
 ## To be in the .zone!
 
+<<<<<<< HEAD
 => ./2022-01-23-welcome-to-the-foo.zone.gmi 2022-01-23 (0565 words) - Welcome to the foo.zone
+=======
+=> ./2022-01-23-welcome-to-the-foo.zone.gmi 2022-01-23 (0543 words) - Welcome to the foo.zone
+>>>>>>> dad79613387a86bd7c45f21e463a15396d775308
 => ./2022-01-01-bash-golf-part-2.gmi 2022-01-01 (1139 words) - Bash Golf Part 2
 => ./2021-12-26-how-to-stay-sane-as-a-devops-person.gmi 2021-12-26 (2280 words) - How to stay sane as a DevOps person 
 => ./2021-11-29-bash-golf-part-1.gmi 2021-11-29 (1286 words) - Bash Golf Part 1