From 49a460d05fe6696709d485c75e21845ccc61520e Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Sun, 23 Jan 2022 22:20:33 +0000
Subject: Publishing new version

---
 gemfeed/atom.xml  | 6 +-----
 gemfeed/index.gmi | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'gemfeed')

diff --git a/gemfeed/atom.xml b/gemfeed/atom.xml
index 1b033928..2c7a597e 100644
--- a/gemfeed/atom.xml
+++ b/gemfeed/atom.xml
@@ -1,10 +1,6 @@
 <?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
+    <updated>2022-01-23T22:20:22+00:00</updated>
     <title>foo.zone feed</title>
     <subtitle>To be in the .zone!</subtitle>
     <link href="gemini://foo.zone/gemfeed/atom.xml" rel="self" />
diff --git a/gemfeed/index.gmi b/gemfeed/index.gmi
index edcde2c1..07c7b64e 100644
--- a/gemfeed/index.gmi
+++ b/gemfeed/index.gmi
@@ -2,11 +2,7 @@
 
 ## 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-23-welcome-to-the-foo.zone.gmi 2022-01-23 (0563 words) - Welcome to the foo.zone
 => ./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
-- 
cgit v1.2.3