akkartik/pensieve.love - Change I7QR62QFLHJDQL2T7I5B7C5NB4RJIO7MPAGROMP6VBAL3MF67BKQC

resolve conflicts

Created by akkartik on December 29, 2023

I7QR62QFLHJDQL2T7I5B7C5NB4RJIO7MPAGROMP6VBAL3MF67BKQC

Dependencies

In channels

main

Change contents

Deletion in run.lua at line 224 [7.178044]
B:BD[5.110] → [6.19:19]
Resurrecting zombie bytes in run.lua at line 224 [7.178044]
B:B[7.179375] → [8.755:814]
BD:B[7.179375] → [8.755:814]
```
  local font = love.graphics.newFont(Settings.font_height)
```
Solving an order conflict in run.lua at line 224 [7.178044]
[5.110]
[8.755]
Resurrecting zombie bytes in run.lua at line 225 [7.178044]
∅:∅[6.19] → [10.1186:1295]
∅:∅[8.814] → [10.1186:1295]
B:B[7.179444] → [10.1186:1295]
BD:B[7.179444] → [10.1186:1295]
```
  -- set up desired window dimensions and make window resizable
  _, _, App.screen.flags = App.screen.size()
```

Replacement in run.lua at line 233 [7.178044]

B:BD[9.9553] → [9.9553:9613]

  love.graphics.setFont(love.graphics.newFont(Font_height))

[9.9553]

[3.2171]

  love.graphics.setFont(font)

Deletion in run.lua at line 269 [7.178044]
B:BD[9.10276] → [11.3040:3040]
B:BD[7.180370] → [8.955:1005]
BD:BD[7.180370] → [8.955:1005]
BD:BD[7.180370] → [8.955:1005]
```
  local font = love.graphics.newFont(font_height)
```
Solving an order conflict in run.lua at line 269 [7.178044]
[11.3038]
[7.180777]

Replacement in run.lua at line 295 [7.178044]

B:BD[9.10819] → [9.10819:10962]

  local result = edit.initialize_state(0, 0, math.min(Display_settings.column_width, App.screen.width-Margin_right), Font_height, Line_height)

[9.10783]

[9.10962]

  local result = edit.initialize_state(0, 0, math.min(Display_settings.column_width, App.screen.width-Margin_right), love.graphics.getFont(), Font_height, Line_height)

Replacement in run.lua at line 958 [7.178044]

B:BD[9.30628] → [9.30628:30688]

  love.graphics.setFont(love.graphics.newFont(Font_height))

[9.30628]

[9.30688]

  local font = love.graphics.newFont(Font_height)

Insertion in run.lua at line 963 [7.178044]
[9.30922]
[9.30922]
```
      pane.font = font
```

Deletion in run.lua at line 1733 [7.178044]

B:BD[7.184045] → [2.210:210]

B:BD[12.137] → [4.645:788]

BD:BD[12.137] → [4.645:788]

B:BD[13.67] → [4.483:644]

BD:BD[13.67] → [4.483:644]

  Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right, font, font_height, math.floor(font_height*1.3))
  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 1733 [7.178044]
[7.184045]

Replacement in commands.lua at line 846 [15.39]

B:BD[14.4314] → [14.4314:4457]

  local result = edit.initialize_state(0, 0, math.min(Display_settings.column_width, App.screen.width-Margin_right), Font_height, Line_height)

[14.4314]

[14.4457]

  local result = edit.initialize_state(0, 0, math.min(Display_settings.column_width, App.screen.width-Margin_right), love.graphics.getFont(), Font_height, Line_height)

resolve conflicts

Dependencies

In channels

Change contents

Deletion in run.lua at line 224 [7.178044]

Resurrecting zombie bytes in run.lua at line 224 [7.178044]

Solving an order conflict in run.lua at line 224 [7.178044]

Resurrecting zombie bytes in run.lua at line 225 [7.178044]

Replacement in run.lua at line 233 [7.178044]

Deletion in run.lua at line 269 [7.178044]

Solving an order conflict in run.lua at line 269 [7.178044]

Replacement in run.lua at line 295 [7.178044]

Replacement in run.lua at line 958 [7.178044]

Insertion in run.lua at line 963 [7.178044]

Deletion in run.lua at line 1733 [7.178044]

Solving an order conflict in run.lua at line 1733 [7.178044]

Replacement in commands.lua at line 846 [15.39]