From 628ab6d4e4d0983eb69545538494909ac337480f Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Fri, 4 Feb 2022 10:02:40 +0000
Subject: Publishing new version

---
 gemfeed/index.md  | 3 ---
 gemfeed/style.css | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'gemfeed')

diff --git a/gemfeed/index.md b/gemfeed/index.md
index 460dbd9d..a96a4906 100644
--- a/gemfeed/index.md
+++ b/gemfeed/index.md
@@ -2,10 +2,7 @@
 
 ## To be in the .zone!
 
-<<<<<<< HEAD
 [2022-02-04 - Computer operating systems I use(d)](./2022-02-04-computer-operating-systems-i-use.md)  
-=======
->>>>>>> 71c68e8c47b04482acac8b63f8468854ac38bb52
 [2022-01-23 - Welcome to the foo.zone](./2022-01-23-welcome-to-the-foo.zone.md)  
 [2022-01-01 - Bash Golf Part 2](./2022-01-01-bash-golf-part-2.md)  
 [2021-12-26 - How to stay sane as a DevOps person ](./2021-12-26-how-to-stay-sane-as-a-devops-person.md)  
diff --git a/gemfeed/style.css b/gemfeed/style.css
index 4511037d..328ad6eb 100644
--- a/gemfeed/style.css
+++ b/gemfeed/style.css
@@ -47,8 +47,8 @@ a {
   color: #ffffff;
   text-decoration: none;
   background-color: #000000;
-  padding: 5px;
-  margin: 5px;
+  padding: 2px;
+  margin: 2px;
 }
 
 a:hover {
-- 
cgit v1.2.3