diff options
| author | Paul Buetow <paul@buetow.org> | 2022-01-23 22:20:04 +0000 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2022-01-23 22:20:04 +0000 |
| commit | 98e12b534ce66317d9b1fa547173925390cb5175 (patch) | |
| tree | 255b5ecca794343c2b3ac4f3451df0a69b34ae6e /gemfeed | |
| parent | 5c01121764d66fbce09077dd4864ac5b8f4a497a (diff) | |
| parent | 347ac2b0e6c3b91776695b9b97f3721d31f21ba2 (diff) | |
done merging
Diffstat (limited to 'gemfeed')
| -rw-r--r-- | gemfeed/2022-01-23-welcome-to-the-foo.zone.html | 2 | ||||
| -rw-r--r-- | gemfeed/atom.xml | 6 | ||||
| -rw-r--r-- | gemfeed/index.html | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/gemfeed/2022-01-23-welcome-to-the-foo.zone.html b/gemfeed/2022-01-23-welcome-to-the-foo.zone.html index 7c8b611c..c5bc59f2 100644 --- a/gemfeed/2022-01-23-welcome-to-the-foo.zone.html +++ b/gemfeed/2022-01-23-welcome-to-the-foo.zone.html @@ -21,7 +21,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/atom.xml b/gemfeed/atom.xml index a31f2396..cbc4c426 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> +>>>>>>> 347ac2b0e6c3b91776695b9b97f3721d31f21ba2 <title>foo.zone feed</title> <subtitle>To be in the .zone!</subtitle> <link href="https://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.html b/gemfeed/index.html index 36cf3279..83286af0 100644 --- a/gemfeed/index.html +++ b/gemfeed/index.html @@ -9,7 +9,11 @@ <body> <h1>Gemfeed of foo.zone</h1> <h2>To be in the .zone!</h2> +<<<<<<< HEAD <a class="textlink" href="./2022-01-23-welcome-to-the-foo.zone.html">2022-01-23 (0565 words) - Welcome to the foo.zone</a><br /> +======= +<a class="textlink" href="./2022-01-23-welcome-to-the-foo.zone.html">2022-01-23 (0543 words) - Welcome to the foo.zone</a><br /> +>>>>>>> 347ac2b0e6c3b91776695b9b97f3721d31f21ba2 <a class="textlink" href="./2022-01-01-bash-golf-part-2.html">2022-01-01 (1139 words) - Bash Golf Part 2</a><br /> <a class="textlink" href="./2021-12-26-how-to-stay-sane-as-a-devops-person.html">2021-12-26 (2280 words) - How to stay sane as a DevOps person </a><br /> <a class="textlink" href="./2021-11-29-bash-golf-part-1.html">2021-11-29 (1286 words) - Bash Golf Part 1</a><br /> |