diff options
Diffstat (limited to 'gemfeed/index.html')
| -rw-r--r-- | gemfeed/index.html | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gemfeed/index.html b/gemfeed/index.html index f1d5ebdb..889c85f8 100644 --- a/gemfeed/index.html +++ b/gemfeed/index.html @@ -9,7 +9,10 @@ <body> <h1>Gemfeed of foo.zone</h1> <h2>To be in the .zone!</h2> +<<<<<<< HEAD <a class="textlink" href="./2022-02-04-computer-operating-systems-i-use.html">2022-02-04 - Computer operating systems I use(d)</a><br /> +======= +>>>>>>> faa99f5a78e223c0e12f04f82fefbe6d66eb60ba <a class="textlink" href="./2022-01-23-welcome-to-the-foo.zone.html">2022-01-23 - Welcome to the foo.zone</a><br /> <a class="textlink" href="./2022-01-01-bash-golf-part-2.html">2022-01-01 - 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 - How to stay sane as a DevOps person </a><br /> |