akkartik/template-live-editor - Change 7LXXQBNEBHSY34L4JBNKXA77CPFJEP2TWMK6B26BBNAMXVCXOMWAC

resolve conflicts

Created by akkartik on September 10, 2024

7LXXQBNEBHSY34L4JBNKXA77CPFJEP2TWMK6B26BBNAMXVCXOMWAC

Dependencies

In channels

main

Change contents

File deletion: source.lua, source.lua

BFD:BFD[5.2] → [6.177715:177749]

BFD:BFD[6.177749] → [6.165829:165829]

B:BD[6.174756] → [4.13:86]

∅:D[4.86] → [6.174756:174901]

  love.keyboard.setTextInput(true)  -- bring up keyboard on touch screen
--?   print('mouse click', x, y)
--?   print(Editor_state.left, Editor_state.right)
--?   print(Log_browser_state.left, Log_browser_state.right)

File deletion: run.lua, run.lua
BFD:BFD[5.2] → [6.183867:183898]
BFD:BFD[5.2] → [6.183867:183898]
BFD:BFD[6.183898] → [6.178107:178107]
B:BD[6.182946] → [4.91:164]
∅:D[4.164] → [8.61:120]
```
  love.keyboard.setTextInput(true)  -- bring up keyboard on touch screen
  return edit.mouse_press(Editor_state, x,y, mouse_button)
```
Deletion in main.lua at line 43 [11.2]
∅:D[9.75] → [10.2351:2424]
B:BD[12.187143] → [10.2351:2424]
```
  love.keyboard.setTextInput(true)  -- bring up keyboard on touch screen
```

Insertion in main.lua at line 221 [11.2]

[10.6894]

[2.8]

  love.keyboard.setTextInput(true)  -- bring up keyboard on touch screen