akkartik/template-carousel-mobile - Change CQVWNL4MQYXJVKECYVKSUMRXYMQVEMYUBHHDTDMEU5GOZ67M7QOAC

Template repo for tiny cross-platform apps that can be modified on phone, tablet or computer.

resolve conflicts

Created by akkartik on July 10, 2024

CQVWNL4MQYXJVKECYVKSUMRXYMQVEMYUBHHDTDMEU5GOZ67M7QOAC

Dependencies

In channels

main

Change contents

Replacement in edit.lua at line 379 [5.413]

B:BD[4.10420] → [4.10420:10475]

function edit.update_font_settings(State, font_height)

[4.10420]

[4.10475]

function edit.update_font_settings(State, font_height, font)

Replacement in edit.lua at line 381 [5.413]

B:BD[4.10509] → [6.1640:1696]

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

[4.10509]

[4.10575]

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

Deletion in edit.lua at line 449 [5.413]
B:BD[4.12430] → [2.1423:1423]
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 449 [5.413]
[4.12430]