Merge upstream

2024-12-06 16:44:12 -05:00
parent 14e8771049
commit 913e60acc9
86 changed files with 1987 additions and 1556 deletions
--- a/blog.bryanroessler.com/index.html
+++ b/blog.bryanroessler.com/index.html
@@ -1,10 +1,9 @@
 ---
-layout: page
+layout: home
 title: 
-subtitle:
+subtitle: Bryan Roessler's Blog
 use-site-title: false
 ---
-<<<<<<< HEAD

 <div class="posts-list">
  {% for post in paginator.posts %}
@@ -71,5 +70,3 @@ use-site-title: false
  {% endif %}
 </ul>
 {% endif %}
-=======
->>>>>>> upstream/master