akkartik/carousel.love - Change GVJEOWYQMHB2YEI5O6YUGHWDNSEINZJY7XM7D5HOFC2MN24J4YRQC

A lightweight programming environment for desktop and mobile devices

resolve conflicts

Created by akkartik on February 17, 2024

GVJEOWYQMHB2YEI5O6YUGHWDNSEINZJY7XM7D5HOFC2MN24J4YRQC

Dependencies

In channels

main

Change contents

File deletion: source_edit.lua, source_edit.lua
BFD:BFD[4.2] → [5.165725:165764]
BFD:BFD[4.2] → [5.165725:165764]
BFD:BFD[5.165764] → [5.152440:152440]
B:BD[6.63] → [3.0:73]
∅:D[3.73] → [5.157112:157151]
```
  love.keyboard.setTextInput(true)  -- bring up keyboard on touch screen
  if State.search_term then return end
```

Insertion in source_edit.lua at line 241 [8.152503]

[7.5615]

[8.157175]

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

Insertion in edit.lua at line 155 [10.413]

[9.1822]

[9.1822]

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

Deletion in edit.lua at line 457 [10.413]
B:BD[9.12430] → [2.5247:5247]
B:BD[6.721] → [3.74:147]
BD:BD[6.721] → [3.74:147]
```
  love.keyboard.setTextInput(true)  -- bring up keyboard on touch screen
```
Solving an order conflict in edit.lua at line 457 [10.413]
[9.12430]