summaryrefslogtreecommitdiff
path: root/gemfeed
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2022-02-04 10:01:31 +0000
committerPaul Buetow <paul@buetow.org>2022-02-04 10:01:31 +0000
commit7aaa8f0f47c93b1ecf62b58bf37630912b7bb1f2 (patch)
tree7f8c1fcc946ce0e7d3a0e6e593753ee106ba17ac /gemfeed
parenta5b5937cac0fb5f9d8ff215f7d9454b9ed8e943f (diff)
parentfaa99f5a78e223c0e12f04f82fefbe6d66eb60ba (diff)
merge
Diffstat (limited to 'gemfeed')
-rw-r--r--gemfeed/index.html3
-rw-r--r--gemfeed/style.css4
2 files changed, 5 insertions, 2 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 />
diff --git a/gemfeed/style.css b/gemfeed/style.css
index 328ad6eb..4511037d 100644
--- a/gemfeed/style.css
+++ b/gemfeed/style.css
@@ -47,8 +47,8 @@ a {
color: #ffffff;
text-decoration: none;
background-color: #000000;
- padding: 2px;
- margin: 2px;
+ padding: 5px;
+ margin: 5px;
}
a:hover {