chore: resolve conflict

This commit is contained in:
Cory Dransfeldt 2024-06-01 07:17:14 -07:00
commit 39272e58d1
No known key found for this signature in database
3 changed files with 10811 additions and 1 deletions

View file

@ -1,3 +1,3 @@
{ {
"timestamp": 1717028029136 "timestamp": 1717121710660
} }

View file

@ -13862,5 +13862,16 @@
"https://social.lol/users/cory/statuses/112527148912147461" "https://social.lol/users/cory/statuses/112527148912147461"
], ],
"lastTootTimestamp": 1717028029128 "lastTootTimestamp": 1717028029128
},
"https://coryd.dev/books/0306922126": {
"id": "aHR0cHM6Ly9jb3J5ZC5kZXYvYm9va3MvMDMwNjkyMjEyNg==",
"title": "📖: More Fun in the New World (⭐️⭐️⭐️⭐️)",
"url": "https://coryd.dev/books/0306922126",
"content_text": "📖: More Fun in the New World (⭐️⭐️⭐️⭐️) #Books #FinishedReading https://coryd.dev/books/0306922126",
"date_published": "Thu, 30 May 2024 00:00:00 GMT",
"toots": [
"https://social.lol/users/cory/statuses/112533288426170340"
],
"lastTootTimestamp": 1717121710652
} }
} }

10799
src/_data/json/read.json Normal file

File diff suppressed because it is too large Load diff