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

+2
View File
@@ -4,6 +4,8 @@
Hello, welcome. This is a blog ("blahg" is the proper spelling for Chicagoans) template. It's built with [Astro](https://astro.build), and uses [TinaCMS](https://tina.io) to edit the content!
![cover](https://github.com/cassidoo/blahg/assets/1454517/b56ff04f-9499-48e7-be62-d9b422c4287d)
## See the blahg
[blahg.netlify.app](https://blahg.netlify.app/)