Event JSON
{
"id": "eb514da583a871c9b899debe83821e5d686b94da062dabdc8bd5343a2348cf1f",
"pubkey": "1bbc6008db85e08ad2cebc63dbbf1f9aaab194983d97eeeb9d5e7e078102f82e",
"created_at": 1724258785,
"kind": 1,
"tags": [
[
"e",
"64128ec5bfe06c2edd51a2502c8189021c4c92330d64603804ba4cea5e3ca1f0",
"",
"root",
"74f6dfd7f697387f2487c848517a061c6fbf9ca487cba8322460d7b2b83a171f"
],
[
"proxy",
"https://emacs.ch/@viz/113001023751659204",
"web"
],
[
"p",
"74f6dfd7f697387f2487c848517a061c6fbf9ca487cba8322460d7b2b83a171f"
],
[
"proxy",
"https://emacs.ch/users/viz/statuses/113001023751659204",
"activitypub"
],
[
"L",
"pink.momostr"
],
[
"l",
"pink.momostr.activitypub:https://emacs.ch/users/viz/statuses/113001023751659204",
"pink.momostr"
],
[
"-"
]
],
"content": "you can right-click on the merge-conflict or the smerge button in the mode-line.",
"sig": "7f0bfcc0f41e733b264e86a103db07ad9453543519b919148d1558fdfbc7dc61936f2a5fbfef7fb3beb79ded5ca688e14afbc00073f91a7505098d7651ee6525"
}