akkartik/pong.love - Change WERJ2X4Y6KF2L4ZXIFIE6OVUJSEGW7HV2TA5MUCOQ3Y7FPMKRPQQC

resolve conflicts

Created by akkartik on October 26, 2025

WERJ2X4Y6KF2L4ZXIFIE6OVUJSEGW7HV2TA5MUCOQ3Y7FPMKRPQQC

Dependencies

In channels

main

Change contents

Deletion in source_edit.lua at line 24 [6.152503]
B:BD[4.16955] → [5.145017:145028]
```
edit = {}
```
Insertion in source_edit.lua at line 27 [6.152503]
[3.113]
[4.16955]
```
edit = {}
```
Insertion in source_edit.lua at line 108 [6.152503]
[5.147312]
[5.147312]
```
    button_handlers = {},
```
Deletion in source_edit.lua at line 114 [6.152503]
B:BD[5.147362] → [2.84:84]
B:BD[6.155363] → [3.114:141]
BD:BD[6.155363] → [3.114:141]
```
    button_handlers = {},
```
Solving an order conflict in source_edit.lua at line 114 [6.152503]
[5.147362]
[8.11]
Deletion in source_edit.lua at line 218 [6.152503]
B:BD[5.148198] → [9.8540:8540]

Resurrecting zombie bytes in source_edit.lua at line 218 [6.152503]

B:B[6.156691] → [3.142:316]

BD:B[6.156691] → [3.142:316]

  local x, y = love.mouse.getPosition()
  if mouse_hover_on_any_button(State, x,y) then
    love.mouse.setCursor(Hand_icon)
  else
    love.mouse.setCursor(Arrow_icon)
  end

Solving an order conflict in source_edit.lua at line 218 [6.152503]
[5.148198]
[3.142]

resolve conflicts

Dependencies

In channels

Change contents

Deletion in source_edit.lua at line 24 [6.152503]

Insertion in source_edit.lua at line 27 [6.152503]

Insertion in source_edit.lua at line 108 [6.152503]

Deletion in source_edit.lua at line 114 [6.152503]

Solving an order conflict in source_edit.lua at line 114 [6.152503]

Deletion in source_edit.lua at line 218 [6.152503]

Resurrecting zombie bytes in source_edit.lua at line 218 [6.152503]

Solving an order conflict in source_edit.lua at line 218 [6.152503]