From 1635318398b360e1a4ed8bafb7ed5498da1b1773 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sun, 23 Jan 2022 22:20:36 +0000 Subject: Publishing new version --- gemfeed/atom.xml | 6 +----- gemfeed/index.html | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) (limited to 'gemfeed') diff --git a/gemfeed/atom.xml b/gemfeed/atom.xml index cbc4c426..a24c268f 100644 --- a/gemfeed/atom.xml +++ b/gemfeed/atom.xml @@ -1,10 +1,6 @@ -<<<<<<< HEAD - 2022-01-23T22:18:35+00:00 -======= - 2022-01-23T20:26:34+00:00 ->>>>>>> 347ac2b0e6c3b91776695b9b97f3721d31f21ba2 + 2022-01-23T22:20:22+00:00 foo.zone feed To be in the .zone! diff --git a/gemfeed/index.html b/gemfeed/index.html index 83286af0..00d95c6c 100644 --- a/gemfeed/index.html +++ b/gemfeed/index.html @@ -9,11 +9,7 @@

Gemfeed of foo.zone

To be in the .zone!

-<<<<<<< HEAD -2022-01-23 (0565 words) - Welcome to the foo.zone
-======= -2022-01-23 (0543 words) - Welcome to the foo.zone
->>>>>>> 347ac2b0e6c3b91776695b9b97f3721d31f21ba2 +2022-01-23 (0563 words) - Welcome to the foo.zone
2022-01-01 (1139 words) - Bash Golf Part 2
2021-12-26 (2280 words) - How to stay sane as a DevOps person
2021-11-29 (1286 words) - Bash Golf Part 1
-- cgit v1.2.3