Resolve merge conflict

This commit is contained in:
Cassidy Williams committed 2024-12-14 09:50:06 -06:00
commit 188c167625
5 files changed
+1823 -18248

No files matched your search

+1 -2
View File
@@ -41,9 +41,8 @@ posts = posts.sort(
subscribe with RSS!
</a>
</p>
<Footer />
</main>
<Footer />
<ColorScript />
</body>
</html>
-2
View File
@@ -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