Draftling sync: 3 file(s) at 2026-10-17T10:01:47Z
[draftling] 1 conflict(s) committed with markers [draftling] 1 conflict(s) committed with markers
Draftling <draftling@localhost> ·
Version 9564f9d307595d0f9666393dc768b5fc23523da0 · previous 3f22675b
Changed draft_002.txt
@@ -13 +13 @@ | ||
| 13 | 13 | |
| 14 | 14 | ladsjkfvd |
| 15 | 15 | |
| 16 | +<<<<<<< ours (remote) | |
| 17 | +>>>>>>> theirs (local) | |
| 18 | +======= | |
| 19 | +======= | |
| 20 | +write something | |
| 21 | +>>>>>>> theirs (local) | |
| 16 | 22 | >>>>>>> theirs (local) |