kfitz/kfitz.info
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:kfitz/kfitz.info

Browse Source 
# Conflicts:
#	_cache/webmentions.json
This commit is contained in:
Kathleen Fitzpatrick
2025-04-17 09:39:08 -04:00
parent 6479418205 eeb1004b46
commit b15ee23d22
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
_cache/webmentions.json
View File

@@ -1,4 +1,5 @@
{ {
HEAD
"lastFetched": "2025-04-17T13:35:25.277Z", "lastFetched": "2025-04-17T13:35:25.277Z",
"children": [ "children": [
{ {
@@ -10542,7 +10543,11 @@
"author": { "author": {
"type": "card", "type": "card",
"name": "Jay Hoffmann", "name": "Jay Hoffmann",
<<<<<<< HEAD
"photo": "https://avatars.webmention.io/spaces.hcommons.social/88e884c089f4656928b8309b52195dba2f0e6e47fd640b6bfb9cec7c9a25c884.png", "photo": "https://avatars.webmention.io/spaces.hcommons.social/88e884c089f4656928b8309b52195dba2f0e6e47fd640b6bfb9cec7c9a25c884.png",
=======
"photo": "https://webmention.io/avatar/spaces.hcommons.social/88e884c089f4656928b8309b52195dba2f0e6e47fd640b6bfb9cec7c9a25c884.png",
>>>>>>> eeb1004b46656e17fc35a3b12c0eb9482e42725a
"url": "https://mastodon.social/@Jayhoffmann" "url": "https://mastodon.social/@Jayhoffmann"
}, },
"url": "https://hcommons.social/@kfitz/114184994490323057#favorited-by-109331292461320201", "url": "https://hcommons.social/@kfitz/114184994490323057#favorited-by-109331292461320201",
@@ -10557,4 +10562,4 @@
"wm-private": false "wm-private": false
} }
] ]
} }