akkartik/capture.love - Change VYIA2JFXSDSLUBTWUA5KRJSPJOJZVZ2WDU7E4BHRCUFUZIGZ2AKAC

In-progress note-taking app based on lines.love

resolve conflicts

Created by akkartik on December 17, 2023

VYIA2JFXSDSLUBTWUA5KRJSPJOJZVZ2WDU7E4BHRCUFUZIGZ2AKAC

Dependencies

In channels

main

Change contents

Replacement in edit.lua at line 240 [5.413]

B:BD[4.3596] → [4.3596:3675]

  if mouse_press_consumed_by_any_button_handler(State, x,y, mouse_button) then

[4.3596]

[4.3675]

  if mouse_press_consumed_by_any_button(State, x,y, mouse_button) then

Deletion in edit.lua at line 619 [5.413]
B:BD[4.17561] → [2.91:91]
B:BD[6.2254] → [3.266:337]
BD:BD[6.2254] → [3.266:337]
```
  if mouse_press_consumed_by_any_button(State, x,y, mouse_button) then
```
Solving an order conflict in edit.lua at line 619 [5.413]
[4.17561]