diff options
| author | Paul Buetow <paul@buetow.org> | 2022-01-23 22:20:33 +0000 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2022-01-23 22:20:33 +0000 |
| commit | 49a460d05fe6696709d485c75e21845ccc61520e (patch) | |
| tree | 8492bfe7d45264d79932f358b925c99219e28498 /gemfeed/atom.xml | |
| parent | 77c4e9cee32d3abeb441676dbe7aa82426ae94e6 (diff) | |
Publishing new version
Diffstat (limited to 'gemfeed/atom.xml')
| -rw-r--r-- | gemfeed/atom.xml | 6 |
1 files changed, 1 insertions, 5 deletions
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" /> |