Draftling sync: 3 file(s) at 2026-10-16T21:49:45Z
[draftling] 1 conflict(s) committed with markers
Draftling <draftling@localhost> ·
Version d2f7e915e32f317194ad30de1a8f86034b89b6fb · previous 8dca7fa0
Changed draft_002.txt
@@ -1 +1 @@ | ||
| 1 | +<<<<<<< ours (remote) | |
| 1 | 2 | write something |
| 3 | +======= | |
| 4 | +write something | |
| 5 | +>>>>>>> theirs (local) |