akkartik/techmeet.love - Change 3ZQY6R4I7PS3UPO7VFCQDVKRPZ6U3SS52ETMB22PT3AZARNKCFVAC

resolve conflicts

Created by akkartik on December 29, 2023

3ZQY6R4I7PS3UPO7VFCQDVKRPZ6U3SS52ETMB22PT3AZARNKCFVAC

Dependencies

In channels

main

Change contents

Replacement in run.lua at line 225 [6.178044]
B:BD[5.110] → [4.19:19]
∅:D[4.19] → [7.755:814]
B:BD[6.179375] → [7.755:814]
```
  local font = love.graphics.newFont(Settings.font_height)
```
[5.110]
[8.1186]
```
  local font = love.graphics.newFont(Font_filename, Settings.font_height)
```
Deletion in run.lua at line 234 [6.178044]
B:BD[9.9553] → [10.86:161]
B:BD[10.161] → [3.191:191]
```
  love.graphics.setFont(love.graphics.newFont(Font_filename, Font_height))
```

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

∅:∅[4.50] → [11.2171:2834]

∅:∅[3.191] → [11.2171:2834]

B:B[9.9613] → [11.2171:2834]

BD:B[9.9613] → [11.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()

Replacement in run.lua at line 959 [6.178044]

B:BD[9.30628] → [10.238:313]

B:BD[9.30628] → [4.222:272]

  love.graphics.setFont(love.graphics.newFont(Font_filename, Font_height))
  local font = love.graphics.newFont(Font_height)

[9.30628]

[9.30688]

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

Replacement in edit.lua at line 602 [13.413]

B:BD[12.264] → [10.327:408]

B:BD[12.264] → [7.1563:1619]

  love.graphics.setFont(love.graphics.newFont(Font_filename, State.font_height))
  State.font = love.graphics.newFont(State.font_height)

[12.264]

[12.337]

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