akkartik/capture.love - Change GYTD7DDWTRLQYLADZWVAJ6PQELUD4NEFPZ7PW7QAXPKGHWEDLIPAC

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

resolve conflicts

Created by akkartik on July 10, 2024

GYTD7DDWTRLQYLADZWVAJ6PQELUD4NEFPZ7PW7QAXPKGHWEDLIPAC

Dependencies

In channels

main

Change contents

Replacement in edit.lua at line 542 [5.413]

B:BD[4.15555] → [4.15555:15610]

function edit.update_font_settings(State, font_height)

[4.15555]

[4.15610]

function edit.update_font_settings(State, font_height, font)

Replacement in edit.lua at line 544 [5.413]

B:BD[4.15644] → [6.230:286]

  State.font = love.graphics.newFont(State.font_height)

[4.15644]

[4.15710]

  State.font = font or love.graphics.newFont(State.font_height)

Deletion in edit.lua at line 612 [5.413]
B:BD[4.17561] → [2.330:330]
B:BD[7.264] → [3.62:126]
BD:BD[7.264] → [3.62:126]
B:BD[8.6146] → [3.0:61]
BD:BD[8.6146] → [3.0:61]
```
  State.font = font or love.graphics.newFont(State.font_height)
function edit.update_font_settings(State, font_height, font)
```
Solving an order conflict in edit.lua at line 612 [5.413]
[4.17561]