txarli/txarli.dev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve merge conflict

Browse Source
This commit is contained in:
Cassidy Williams
2024-12-14 09:50:06 -06:00
parent 444cbe1502 c7ca18f2ee
commit 188c167625
5 changed files with 1823 additions and 18248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/FUNDING.yml vendored Normal file
View File

@@ -0,0 +1,3 @@
github: [cassidoo]
patreon: cassidoo
custom: ['https://paypal.me/cassidoo', 'https://venmo.com/cassidoo']

2
README.md
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! 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 ## See the blahg
[blahg.netlify.app](https://blahg.netlify.app/) [blahg.netlify.app](https://blahg.netlify.app/)

20061
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

3
src/pages/posts.astro
View File

@@ -41,9 +41,8 @@ posts = posts.sort(
subscribe with RSS! subscribe with RSS!
</a> </a>
</p> </p>
<Footer />
</main> </main>
<Footer />
<ColorScript /> <ColorScript />
</body> </body>
</html> </html>

2
src/posts/markdown-example.md
View File

@@ -51,8 +51,6 @@ V franzen umami hammock scenester retro VHS, pop-up truffaut tacos polaroid heir
**bold** _italic_ **bold** _italic_
**_bold and italic_** **_bold and italic_**
~~strikethrough~~
==highlighted text==
```js ```js
// This is an example of some React // This is an example of some React