diff options
| author | Paul Buetow <paul@buetow.org> | 2022-01-23 22:19:43 +0000 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2022-01-23 22:19:43 +0000 |
| commit | 77c4e9cee32d3abeb441676dbe7aa82426ae94e6 (patch) | |
| tree | 6cf1ca83a4b35efa1239cc7d79b5a612de3073de /gemfeed/index.gmi | |
| parent | 5340435b6b333d6f4e102ee11c0990f0cad7999a (diff) | |
| parent | dad79613387a86bd7c45f21e463a15396d775308 (diff) | |
done meging
Diffstat (limited to 'gemfeed/index.gmi')
| -rw-r--r-- | gemfeed/index.gmi | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gemfeed/index.gmi b/gemfeed/index.gmi index 67b7730d..edcde2c1 100644 --- a/gemfeed/index.gmi +++ b/gemfeed/index.gmi @@ -2,7 +2,11 @@ ## 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-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 |