summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gemfeed/2021-09-12-keep-it-simple-and-stupid.md10
-rw-r--r--gemfeed/index.md2
2 files changed, 5 insertions, 7 deletions
diff --git a/gemfeed/2021-09-12-keep-it-simple-and-stupid.md b/gemfeed/2021-09-12-keep-it-simple-and-stupid.md
index 3b5cafe6..96dcba6c 100644
--- a/gemfeed/2021-09-12-keep-it-simple-and-stupid.md
+++ b/gemfeed/2021-09-12-keep-it-simple-and-stupid.md
@@ -43,15 +43,13 @@ Coming back to COBOL, k8s is on its way to becoming something similar. One day,
[https://www.techrepublic.com/article/why-kubernetes-is-our-modern-day-cobol-says-a-tech-expert/](https://www.techrepublic.com/article/why-kubernetes-is-our-modern-day-cobol-says-a-tech-expert/)
-<<<<<<< HEAD
-And here is something to smile about:
-
-[https://christine.website/blog/theres-a-node-2021-10-02](https://christine.website/blog/theres-a-node-2021-10-02)
-=======
Another article which stroke me is:
[Today's Students Don't Understand the Basics of Computer Operations ](https://it.slashdot.org/story/21/09/23/163212/todays-students-dont-understand-the-basics-of-computer-operations)
->>>>>>> 1aa43e960a9fe7bc0d87042316d740266512bfe2
+
+And here is something to smile about:
+
+[https://christine.website/blog/theres-a-node-2021-10-02](https://christine.website/blog/theres-a-node-2021-10-02)
# The bloated web
diff --git a/gemfeed/index.md b/gemfeed/index.md
index 63875d1f..ab65d511 100644
--- a/gemfeed/index.md
+++ b/gemfeed/index.md
@@ -2,7 +2,7 @@
## Having fun with computers!
-[2021-09-12 (1365 words) - Keep it simple and stupid](./2021-09-12-keep-it-simple-and-stupid.md)
+[2021-09-12 (1360 words) - Keep it simple and stupid](./2021-09-12-keep-it-simple-and-stupid.md)
[2021-08-01 (2919 words) - On being Pedantic about Open-Source](./2021-08-01-on-being-pedantic-about-open-source.md)
[2021-07-04 (2048 words) - The Well-Grounded Rubyist](./2021-07-04-the-well-grounded-rubyist.md)
[2021-06-05 (1191 words) - Gemtexter - One Bash script to rule it all](./2021-06-05-gemtexter-one-bash-script-to-rule-it-all.md)