diff options
Diffstat (limited to 'gemfeed')
| -rw-r--r-- | gemfeed/atom.xml | 6 | ||||
| -rw-r--r-- | gemfeed/index.html | 6 |
2 files changed, 2 insertions, 10 deletions
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" /> 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 @@ <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-23-welcome-to-the-foo.zone.html">2022-01-23 (0563 words) - Welcome to the foo.zone</a><br /> <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 /> |