Skip to content

Commit

Permalink
merge: resolved conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
1p22geo committed Jun 6, 2024
1 parent 9d0920f commit 422d1d5
Show file tree
Hide file tree
Showing 2 changed files with 5,561 additions and 1 deletion.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"markdown-to-jsx": "^7.1.6",
"moment": "2.29.4",
"moment-timezone": "^0.5.45",
"next-plausible": "^3.11.1",
"next": "14.1.1",
"next-plausible": "^3.11.1",
"next-sitemap": "^4.2.3",
"next-themes": "^0.2.1",
"node-ical": "0.16.1",
Expand Down
Loading

0 comments on commit 422d1d5

Please sign in to comment.