Resolve merge conflict

2024-12-14 09:50:06 -06:00
parent 444cbe1502 c7ca18f2ee
commit 188c167625
5 changed files with 1823 additions and 18248 deletions
--- a/src/pages/posts.astro
+++ b/src/pages/posts.astro
@@ -41,9 +41,8 @@ posts = posts.sort(
 					subscribe with RSS!
 				</a>
 			</p>
-
-			<Footer />
 		</main>
+		<Footer />
 		<ColorScript />
 	</body>
 </html>
--- a/src/posts/markdown-example.md
+++ b/src/posts/markdown-example.md
@@ -51,8 +51,6 @@ V franzen umami hammock scenester retro VHS, pop-up truffaut tacos polaroid heir

 **bold** _italic_
 **_bold and italic_**
-~~strikethrough~~
-==highlighted text==

 ```js
 // This is an example of some React