akkartik/techmeet-capture.love - Change KF72R2XXLH3T6A23JRVR23E77IHVCX7EJA26ZB5RZ2SHFVCRVVVAC

resolve conflicts

Created by akkartik on December 29, 2023

KF72R2XXLH3T6A23JRVR23E77IHVCX7EJA26ZB5RZ2SHFVCRVVVAC

Dependencies

In channels

main

Change contents

Insertion in run.lua at line 66 [5.178044]

[4.67]

[4.68]

  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 run.lua at line 176 [5.178044]

B:BD[5.184045] → [6.210:210]

B:BD[4.67] → [3.483:644]

BD:BD[4.67] → [3.483:644]

  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))

Solving an order conflict in run.lua at line 176 [5.178044]
[5.184045]
Resurrecting zombie bytes in edit.lua at line 109 [10.413]
B:B[8.98042] → [9.1495:1525]
BD:B[8.98042] → [9.1495:1525]
```
end  -- edit.initialize_state
```
Insertion in edit.lua at line 162 [10.413]
[12.509]
[12.509]
```
  love.graphics.setFont(State.font)
```

Replacement in edit.lua at line 555 [10.413]

B:BD[12.15644] → [12.15644:15710]

  love.graphics.setFont(love.graphics.newFont(State.font_height))

[12.15644]

[12.15710]

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

Replacement in edit.lua at line 572 [10.413]

B:BD[12.16196] → [12.16196:16250]

      14,  -- font height assuming default LÖVE font

[12.16196]

[12.16250]

      love.graphics.getFont(),
      14,

Deletion in edit.lua at line 622 [10.413]
B:BD[12.17561] → [2.102:102]
B:BD[13.1119] → [9.1620:1651]
BD:BD[13.1119] → [9.1620:1651]
B:BD[14.264] → [9.1563:1619]
BD:BD[14.264] → [9.1563:1619]
B:BD[15.44] → [9.1526:1562]
BD:BD[15.44] → [9.1526:1562]
B:BD[9.1651] → [3.1328:1338]
BD:BD[9.1651] → [3.1328:1338]
```
      love.graphics.getFont(),
  State.font = love.graphics.newFont(State.font_height)
  love.graphics.setFont(State.font)
      14,
```
Solving an order conflict in edit.lua at line 622 [10.413]
[12.17561]

resolve conflicts

Dependencies

In channels

Change contents

Insertion in run.lua at line 66 [5.178044]

Deletion in run.lua at line 176 [5.178044]

Solving an order conflict in run.lua at line 176 [5.178044]

Resurrecting zombie bytes in edit.lua at line 109 [10.413]

Insertion in edit.lua at line 162 [10.413]

Replacement in edit.lua at line 555 [10.413]

Replacement in edit.lua at line 572 [10.413]

Deletion in edit.lua at line 622 [10.413]

Solving an order conflict in edit.lua at line 622 [10.413]