akkartik/template-live-editor - Change RXZQUKKR2I4JJUSURDNGBMPPOH4ASAPB6Y2C67I52RSZYPPR6B7AC

resolve conflicts

Created by akkartik on May 20, 2024

RXZQUKKR2I4JJUSURDNGBMPPOH4ASAPB6Y2C67I52RSZYPPR6B7AC

Dependencies

In channels

main

Change contents

Deletion in reference.md at line 75 [5.17]

B:BD[5.3431] → [3.18:159]


* `App.mousemoved(x,y, dx,dy, is_touch)` -- called any time the mouse moves.
  (Based on [LÖVE](https://love2d.org/wiki/love.mousemoved).)

Deletion in reference.md at line 82 [5.17]

B:BD[5.3781] → [3.160:320]

* `App.mousefocus(in_focus)` -- called when the mouse pointer moves on or off
  the app window.
  (Based on [LÖVE](https://love2d.org/wiki/love.mousefocus).)

Deletion in main.lua at line 275 [7.2]
B:BD[6.336] → [2.12:12]
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]
B:BD[13.364] → [9.172:218]
BD:BD[13.364] → [9.172:218]
BD:BD[13.364] → [9.172:218]
BD:BD[13.364] → [9.172:218]
BD:BD[13.364] → [9.172:218]
∅:D[9.171] → [13.293:364]
B:BD[13.293] → [13.293:364]
BD:BD[13.293] → [13.293:364]
BD:BD[13.293] → [13.293:364]
B:BD[13.234] → [9.94:171]
BD:BD[13.234] → [9.94:171]
BD:BD[13.234] → [9.94:171]
BD:BD[13.234] → [9.94:171]
∅:D[9.93] → [13.196:234]
B:BD[13.196] → [13.196:234]
BD:BD[13.196] → [13.196:234]
BD:BD[13.196] → [13.196:234]
B:BD[13.143] → [9.22:93]
BD:BD[13.143] → [9.22:93]
BD:BD[13.143] → [9.22:93]
∅:D[9.21] → [13.66:143]
B:BD[13.66] → [13.66:143]
BD:BD[13.66] → [13.66:143]
BD:BD[13.66] → [13.66:143]
∅:D[9.346] → [15.20:351]
B:BD[16.102] → [15.20:351]
BD:BD[16.102] → [15.20:351]
```
    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
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 275 [7.2]
[6.336]
[17.151]

resolve conflicts

Dependencies

In channels

Change contents

Deletion in reference.md at line 75 [5.17]

Deletion in reference.md at line 82 [5.17]

Deletion in main.lua at line 275 [7.2]

Solving an order conflict in main.lua at line 275 [7.2]