Skip to content

Commit

Permalink
chore: fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@MichaelTaylor3D
MichaelTaylor3D committed Feb 28, 2024
1 parent 6fd6bf5 commit 0e8a7bf
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,6 @@ dist-ssr

# Contentlayer
.contentlayer

.package-lock.json

0 comments on commit 0e8a7bf

Please sign in to comment.