summaryrefslogtreecommitdiff
path: root/gemfeed/index.gmi
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2022-01-23 22:20:33 +0000
committerPaul Buetow <paul@buetow.org>2022-01-23 22:20:33 +0000
commit49a460d05fe6696709d485c75e21845ccc61520e (patch)
tree8492bfe7d45264d79932f358b925c99219e28498 /gemfeed/index.gmi
parent77c4e9cee32d3abeb441676dbe7aa82426ae94e6 (diff)
Publishing new version
Diffstat (limited to 'gemfeed/index.gmi')
-rw-r--r--gemfeed/index.gmi6
1 files changed, 1 insertions, 5 deletions
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