akkartik/techmeet.love - Change 6VWTCDYOMK2JMVZ43OEJTVK4DNX3S2YA4HMNYO7CQJ23NC7OPVPAC

resolve conflicts

Created by akkartik on January 22, 2024

6VWTCDYOMK2JMVZ43OEJTVK4DNX3S2YA4HMNYO7CQJ23NC7OPVPAC

Dependencies

In channels

main

Change contents

Replacement in run.lua at line 225 [6.178044]

B:BD[5.110] → [3.18:92]

B:BD[5.110] → [4.553:623]

  local font = love.graphics.newFont(Font_filename, Settings.font_height)
  Display_settings.font = love.graphics.newFont(Settings.font_height)

[5.110]

[7.1186]

  Display_settings.font = love.graphics.newFont(Font_filename, Settings.font_height)

Resurrecting zombie bytes in run.lua at line 235 [6.178044]

∅:∅[8.50] → [9.2171:2834]

∅:∅[10.191] → [9.2171:2834]

∅:∅[4.671] → [9.2171:2834]

B:B[11.9613] → [9.2171:2834]

BD:B[8.50] → [9.2171:2834]

end
function run.load_more_settings_from_notes_directory()
  local f = App.open_for_reading(Directory..'config')
  if f then
    local directory_settings = json.decode(f:read())
    f:close()
    Display_settings.column_width = directory_settings.column_width
    for _,column_name in ipairs(directory_settings.columns) do
      create_column(column_name)
    end
    Cursor_pane.col = directory_settings.cursor_col
    Cursor_pane.row = directory_settings.cursor_row
    Display_settings.x = directory_settings.surface_x
    Display_settings.y = directory_settings.surface_y
  else
    -- initialize surface with a single column
    command.recently_modified()

Deletion in run.lua at line 267 [6.178044]
B:BD[5.154] → [4.672:733]
BD:BD[5.154] → [4.672:733]
```
  Display_settings.font = love.graphics.newFont(Font_height)
```
Resurrecting zombie bytes in run.lua at line 267 [6.178044]
B:B[4.733] → [4.733:780]
BD:B[4.733] → [4.733:780]
```
  love.graphics.setFont(Display_settings.font)
```

Insertion in run.lua at line 267 [6.178044]

[5.154]

[4.733]

  Display_settings.font = love.graphics.newFont(Font_filename, Font_height)

Deletion in run.lua at line 269 [6.178044]

B:BD[5.189] → [12.162:237]

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

Resurrecting zombie bytes in run.lua at line 269 [6.178044]
B:B[12.237] → [2.18:53]
BD:B[12.237] → [2.18:53]
```
  run.initialize_window_geometry()
```
Deletion in run.lua at line 270 [6.178044]
∅:D[13.18] → [14.2986:3038]
∅:D[2.53] → [14.2986:3038]
B:BD[11.10101] → [14.2986:3038]
BD:BD[11.10101] → [14.2986:3038]
```
  Display_settings.column_width = 40*App.width('m')
```
Resurrecting zombie bytes in run.lua at line 270 [6.178044]
B:B[5.189] → [4.781:854]
BD:B[5.189] → [4.781:854]
```
  Display_settings.column_width = 40*Display_settings.font:getWidth('m')
```
Solving an order conflict in run.lua at line 270 [6.178044]
[2.53]
[4.781]
Insertion in run.lua at line 960 [6.178044]
[11.30628]
[3.93]
```
<<<<<<< HEAD
```
Solving an order conflict in run.lua at line 962 [6.178044]
[3.158]
Insertion in run.lua at line 962 [6.178044]
[0.198]
[4.1416]
```
=======
```
Insertion in run.lua at line 964 [6.178044]
[4.1477]
[11.30688]
```
>>>>>>> upstream/main
```

resolve conflicts

Dependencies

In channels

Change contents

Replacement in run.lua at line 225 [6.178044]

Resurrecting zombie bytes in run.lua at line 235 [6.178044]

Deletion in run.lua at line 267 [6.178044]

Resurrecting zombie bytes in run.lua at line 267 [6.178044]

Insertion in run.lua at line 267 [6.178044]

Deletion in run.lua at line 269 [6.178044]

Resurrecting zombie bytes in run.lua at line 269 [6.178044]

Deletion in run.lua at line 270 [6.178044]

Resurrecting zombie bytes in run.lua at line 270 [6.178044]

Solving an order conflict in run.lua at line 270 [6.178044]

Insertion in run.lua at line 960 [6.178044]

Solving an order conflict in run.lua at line 962 [6.178044]

Insertion in run.lua at line 962 [6.178044]

Insertion in run.lua at line 964 [6.178044]