Update draft_002.txt
[draftling] 1 conflict(s) committed with markers
Draftling <draftling@localhost> ·
Version ebc65c4028be8d2458a411f364806d3f7cb3282c · previous d2f7e915
Changed draft_002.txt
@@ -1 +1 @@ | ||
| 1 | 1 | <<<<<<< ours (remote) |
| 2 | 2 | write something |
| 3 | +<<<<<<< ours (remote) | |
| 3 | 4 | ======= |
| 4 | 5 | write something |
| 6 | +>>>>>>> theirs (local) | |
| 7 | +======= | |
| 8 | + | |
| 9 | +blah blah | |
| 5 | 10 | >>>>>>> theirs (local) |