akkartik/pong.love - Change NKGOFJYETE3B42J5HBFHKW2TR5YN3LNWFXYBUTOYEHBXHLBNYGGAC

resolve conflicts

Created by akkartik on May 20, 2024

NKGOFJYETE3B42J5HBFHKW2TR5YN3LNWFXYBUTOYEHBXHLBNYGGAC

Dependencies

In channels

main

Change contents

Insertion in main.lua at line 305 [5.2]

[4.542]

  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
end
function App.mousemoved(x,y, dx,dy, is_touch)
  if current_app_is_warning() then return end
  if Current_app == 'run' then
    if run.mouse_move then run.mouse_move(dx,dy) end
  elseif Current_app == 'source' then
    if source.mouse_move then source.mouse_move(dx,dy) end

Deletion in main.lua at line 326 [5.2]
B:BD[6.146] → [7.2169:2169]
B:BD[8.1059] → [9.273:332]
BD:BD[8.1059] → [9.273:332]
BD:BD[8.1059] → [9.273:332]
B:BD[8.956] → [9.219:272]
BD:BD[8.956] → [9.219:272]
B:BD[11.889] → [9.21:21]
BD:BD[11.889] → [9.21:21]
BD:BD[11.889] → [9.21:21]
BD:BD[11.889] → [9.21:21]
B:BD[14.364] → [9.172:218]
BD:BD[14.364] → [9.172:218]
BD:BD[14.364] → [9.172:218]
BD:BD[14.364] → [9.172:218]
BD:BD[14.364] → [9.172:218]
BD:BD[14.364] → [9.172:218]
∅:D[9.171] → [14.293:364]
B:BD[14.293] → [14.293:364]
BD:BD[14.293] → [14.293:364]
BD:BD[14.293] → [14.293:364]
BD:BD[14.293] → [14.293:364]
B:BD[14.234] → [9.94:171]
BD:BD[14.234] → [9.94:171]
BD:BD[14.234] → [9.94:171]
BD:BD[14.234] → [9.94:171]
BD:BD[14.234] → [9.94:171]
∅:D[9.93] → [14.196:234]
B:BD[14.196] → [14.196:234]
BD:BD[14.196] → [14.196:234]
BD:BD[14.196] → [14.196:234]
BD:BD[14.196] → [14.196:234]
B:BD[14.143] → [9.22:93]
BD:BD[14.143] → [9.22:93]
BD:BD[14.143] → [9.22:93]
BD:BD[14.143] → [9.22:93]
∅:D[9.21] → [14.66:143]
B:BD[14.66] → [14.66:143]
BD:BD[14.66] → [14.66:143]
BD:BD[14.66] → [14.66:143]
BD:BD[14.66] → [14.66:143]
```
    if source.mouse_move then source.mouse_move(dx,dy) end
    if run.mouse_move then run.mouse_move(dx,dy) end
function App.mousemoved(x,y, dx,dy, is_touch)
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
end
    if source.mouse_release then source.mouse_release(x,y, mouse_button) end
  elseif Current_app == 'source' then
    if run.mouse_release then run.mouse_release(x,y, mouse_button) end
  if current_app_is_warning() then return end
  if Current_app == 'run' then
```
Solving an order conflict in main.lua at line 326 [5.2]
[6.146]
[4.711]

Insertion in main.lua at line 332 [5.2]

[4.853]

function App.mousefocus(in_focus)
  if current_app_is_warning() then return end
  if Current_app == 'run' then
    if run.mouse_focus then run.mouse_focus(in_focus) end
  elseif Current_app == 'source' then
    if source.mouse_focus then source.mouse_focus(in_focus) end
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
end

Deletion in main.lua at line 361 [5.2]

B:BD[4.1309] → [2.14869:14869]

∅:D[9.346] → [16.20:351]

B:BD[17.102] → [16.20:351]

D:D[17.102] → [16.20:351]

BD:BD[17.102] → [16.20:351]

function App.mousefocus(in_focus)
  if current_app_is_warning() then return end
  if Current_app == 'run' then
    if run.mouse_focus then run.mouse_focus(in_focus) end
  elseif Current_app == 'source' then
    if source.mouse_focus then source.mouse_focus(in_focus) end
  else
    assert(false, 'unknown app "'..Current_app..'"')

Solving an order conflict in main.lua at line 361 [5.2]
[4.1309]
[19.1196]