akkartik/pothi.love - Change L3MIWDL2H4XO4777KX7VTNFVY5Z5HFC7VSTHCXFIIH4CB7RC74PQC

resolve conflicts

Created by akkartik on November 18, 2023

L3MIWDL2H4XO4777KX7VTNFVY5Z5HFC7VSTHCXFIIH4CB7RC74PQC

Dependencies

[2] C4RZN6K6RH3L4BA5CPJD4WIUBTDTZA6XYM7YE6TMYVGCPAMRSURQC
[3] CWL5COBGVVKVMWCOLG7GQX4QE5RPJ3R6CC7SM5FR7E4HKNDCE3UQC
[4] QRIXWLCQUQWGIUZ5FHRLDZP5XQEVTPWKUDYC5ZOABC7TFFHRODNQC
[5] EDRTD2YKYXX7R4NCJC757JIOVGDVJBQHFC3HYDD2ONDWMPFJOJ6AC
[6] BULPIBEGL7TMK6CVIE7IS7WGAHGOSUJBGJSFQK542MOWGHP2ADQQC
[7] SPSW74Y5OJ54Y7VQ3SJFCJR5CYDKTR4A3TOEVZODDZLUSDDU2GZAC
[8] G3DLS5OUO77V4MC6754KTETRCTVUBYBHMGR7MTV52IYYM7QA3ROQC
[9] LSYLEVBDBZBGLSCXTRBW46WT4TUMMSPCH7M6HSNYI5SIH2WNPYEAC
[10] MTJEVRJR5GLWUSK7HMIM4UXM6GS6O6YCRWJT3DUSU2RYMHCQNOEQC

In channels

main

Change contents

Deletion in text.lua at line 19 [6.1]
B:BD[5.52] → [4.5:5]
BD:BD[5.52] → [4.5:5]
Resurrecting zombie bytes in text.lua at line 230 [6.1]
B:B[7.2865] → [3.84:109]
BD:B[7.2865] → [3.84:109]
```
    schedule_save(State)
```

Insertion in text.lua at line 230 [6.1]

[9.122]

[3.84]

    assert(Text.le1(State.screen_top1, State.cursor1), ('screen_top (line=%d,pos=%d) is below cursor (line=%d,pos=%d)'):format(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos))

Deletion in text.lua at line 232 [6.1]

B:BD[9.122] → [8.702:916]

    assert(Text.le1(State.screen_top1, State.cursor1), ('screen_top (line=%d,pos=%d) is below cursor (line=%d,pos=%d)'):format(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos))

Solving an order conflict in text.lua at line 232 [6.1]
[3.109]
[10.1586]

resolve conflicts

Dependencies

In channels

Change contents

Deletion in text.lua at line 19 [6.1]

Resurrecting zombie bytes in text.lua at line 230 [6.1]

Insertion in text.lua at line 230 [6.1]

Deletion in text.lua at line 232 [6.1]

Solving an order conflict in text.lua at line 232 [6.1]