diff options
| author | Paul Buetow <paul@buetow.org> | 2022-01-23 22:20:04 +0000 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2022-01-23 22:20:04 +0000 |
| commit | 98e12b534ce66317d9b1fa547173925390cb5175 (patch) | |
| tree | 255b5ecca794343c2b3ac4f3451df0a69b34ae6e /gemfeed/index.html | |
| parent | 5c01121764d66fbce09077dd4864ac5b8f4a497a (diff) | |
| parent | 347ac2b0e6c3b91776695b9b97f3721d31f21ba2 (diff) | |
done merging
Diffstat (limited to 'gemfeed/index.html')
| -rw-r--r-- | gemfeed/index.html | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gemfeed/index.html b/gemfeed/index.html index 36cf3279..83286af0 100644 --- a/gemfeed/index.html +++ b/gemfeed/index.html @@ -9,7 +9,11 @@ <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-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 /> |