akkartik/carousel.love - Change IS3FHU6QWF2EE435AVPAIASB4IQM3GSTHU5XFWSIKEDVF4PFEZHQC

resolve conflicts

Created by akkartik on December 29, 2023

IS3FHU6QWF2EE435AVPAIASB4IQM3GSTHU5XFWSIKEDVF4PFEZHQC

Dependencies

In channels

main

Change contents

Deletion in reference.md at line 491 [8.17]
B:BD[6.1123] → [7.1377:1377]
Solving an order conflict in reference.md at line 491 [8.17]
[2.1843]

Insertion in main.lua at line 107 [10.2]

[9.184]

  love.graphics.setFont(love.graphics.newFont(font_height))
  -- set up desired window dimensions and make window resizable

Deletion in main.lua at line 117 [10.2]

B:BD[11.3172] → [5.11:70]

BD:BD[11.3172] → [5.11:70]

B:BD[13.166] → [5.71:232]

BD:BD[13.166] → [5.71:232]

  local font = love.graphics.newFont(settings.font_height)
  Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right, font, settings.font_height, math.floor(settings.font_height*1.3))

Deletion in main.lua at line 133 [10.2]
B:BD[11.4163] → [5.233:283]
BD:BD[11.4163] → [5.233:283]
BD:BD[11.4163] → [5.233:283]
B:BD[15.41] → [5.284:427]
BD:BD[15.41] → [5.284:427]
BD:BD[15.41] → [5.284:427]
```
  local font = love.graphics.newFont(font_height)
  Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right, font, font_height, math.floor(font_height*1.3))
```
Deletion in edit.lua at line 108 [18.413]
B:BD[17.58] → [4.16:16]
Resurrecting zombie bytes in edit.lua at line 108 [18.413]
B:B[19.84] → [7.1603:1639]
BD:B[19.84] → [7.1603:1639]
```
  love.graphics.setFont(State.font)
```
Solving an order conflict in edit.lua at line 108 [18.413]
[17.58]
[7.1603]

resolve conflicts

Dependencies

In channels

Change contents

Deletion in reference.md at line 491 [8.17]

Solving an order conflict in reference.md at line 491 [8.17]

Insertion in main.lua at line 107 [10.2]

Deletion in main.lua at line 117 [10.2]

Deletion in main.lua at line 133 [10.2]

Deletion in edit.lua at line 108 [18.413]

Resurrecting zombie bytes in edit.lua at line 108 [18.413]

Solving an order conflict in edit.lua at line 108 [18.413]