summaryrefslogtreecommitdiff
path: root/gemfeed
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2022-01-23 22:20:38 +0000
committerPaul Buetow <paul@buetow.org>2022-01-23 22:20:38 +0000
commit696f839a33b4ea58fd5b5ee643696402dfbb7e00 (patch)
treeeab895f9860aac054fe74983e2c5ac4d03301606 /gemfeed
parentec16668d047c55c0eacfee991b1282626f490b94 (diff)
Publishing new version
Diffstat (limited to 'gemfeed')
-rw-r--r--gemfeed/index.md6
1 files changed, 1 insertions, 5 deletions
diff --git a/gemfeed/index.md b/gemfeed/index.md
index e3e86bdd..4cdc1e36 100644
--- a/gemfeed/index.md
+++ b/gemfeed/index.md
@@ -2,11 +2,7 @@
## To be in the .zone!
-<<<<<<< HEAD
-[2022-01-23 (0565 words) - Welcome to the foo.zone](./2022-01-23-welcome-to-the-foo.zone.md)
-=======
-[2022-01-23 (0543 words) - Welcome to the foo.zone](./2022-01-23-welcome-to-the-foo.zone.md)
->>>>>>> bf389056f4d3e482a592295ce9f8842b7a265731
+[2022-01-23 (0563 words) - Welcome to the foo.zone](./2022-01-23-welcome-to-the-foo.zone.md)
[2022-01-01 (1139 words) - Bash Golf Part 2](./2022-01-01-bash-golf-part-2.md)
[2021-12-26 (2280 words) - How to stay sane as a DevOps person ](./2021-12-26-how-to-stay-sane-as-a-devops-person.md)
[2021-11-29 (1286 words) - Bash Golf Part 1](./2021-11-29-bash-golf-part-1.md)