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

---
 gemfeed/atom.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'gemfeed/atom.xml')

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 @@
 <?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
+    <updated>2022-01-23T22:20:22+00:00</updated>
     <title>foo.zone feed</title>
     <subtitle>To be in the .zone!</subtitle>
     <link href="https://foo.zone/gemfeed/atom.xml" rel="self" />
-- 
cgit v1.2.3