Draftling sync: 3 file(s) at 2026-10-23T13:43:31Z
Draftling <draftling@localhost> ·
Version 4e4c3cf55b44ad0e4f7fa183951a55fd988c1a46 · previous 900dd275
Changed draft_002.txt
@@ -1 +1 @@ | ||
| 1 | -<<<<<<< ours (remote) | |
| 2 | -write something | |
| 3 | -<<<<<<< ours (remote) | |
| 4 | -======= | |
| 5 | -write something | |
| 6 | ->>>>>>> theirs (local) | |
| 7 | -======= | |
| 8 | 1 | |
| 9 | -blah blah | |
| 10 | -<<<<<<< ours (remote) | |
| 11 | ->>>>>>> theirs (local) | |
| 12 | -======= | |
| 13 | - | |
| 14 | -ladsjkfvd | |
| 15 | - | |
| 16 | -<<<<<<< ours (remote) | |
| 17 | ->>>>>>> theirs (local) | |
| 18 | -======= | |
| 19 | -======= | |
| 20 | 2 | write something |
| 21 | ->>>>>>> theirs (local) | |
| 22 | ->>>>>>> theirs (local) |