Draftling sync: 4 file(s) at 2026-10-16T21:56:53Z
[draftling] 1 conflict(s) committed with markers
Draftling <draftling@localhost> ·
Version bbb1cc69f4cb05bd24771ba7cefde64e01828632 · previous ebc65c40
Changed draft_002.txt
@@ -7 +7 @@ | ||
| 7 | 7 | ======= |
| 8 | 8 | |
| 9 | 9 | blah blah |
| 10 | +<<<<<<< ours (remote) | |
| 11 | +>>>>>>> theirs (local) | |
| 12 | +======= | |
| 13 | + | |
| 14 | +ladsjkfvd | |
| 15 | + | |
| 10 | 16 | >>>>>>> theirs (local) |
Added draft_003.md
@@ -1 +1 @@ | ||
| 1 | +привіт! | |
| 2 | + | |
| 3 | +як справи? |