akkartik/template-carousel-mobile - Change FPQJ2CR5B5LOYTGC7H52DR23JHNRF7ENRTFMAN7JZLEZTCFCVRYQC

resolve conflicts

Created by akkartik on December 26, 2023

FPQJ2CR5B5LOYTGC7H52DR23JHNRF7ENRTFMAN7JZLEZTCFCVRYQC

Dependencies

In channels

main

Change contents

Solving an order conflict in reference.md at line 84 [4.17]
[2.569]
[3.8]

Deletion in reference.md at line 85 [4.17]

B:BD[3.9] → [3.9:307]

∅:D[3.307] → [4.3431:3432]

∅:D[2.569] → [4.3431:3432]

B:BD[4.3431] → [4.3431:3432]

* `on.mouse_move(x,y, dx,dy, istouch)` -- called when you move the mouse.
  Provides in `x` and `y` the point on the screen at which the click occurred
  and in `dx` and `dy` the amount moved since the previous call of
  `mouse_move`.
  (Based on [LÖVE](https://love2d.org/wiki/love.mousemoved).)

Solving an order conflict in main.lua at line 198 [5.2]
[2.685]
[3.310]
Deletion in main.lua at line 200 [5.2]
B:BD[3.315] → [3.315:423]
∅:D[3.423] → [6.13:13]
∅:D[2.685] → [6.13:13]
B:BD[7.181] → [6.13:13]
∅:D[6.13] → [8.7142:7147]
∅:D[9.129] → [8.7142:7147]
∅:D[7.181] → [8.7142:7147]
∅:D[10.434] → [8.7142:7147]
B:BD[8.7142] → [8.7142:7147]
```
function App.mousemoved(x,y, dx,dy, istouch)
  if on.mouse_move then on.mouse_move(x,y, dx,dy, istouch) end
end
```
Deletion in 0001-on at line 14 [11.73]
B:BD[7.444] → [2.831:874]
```
  --   on.mouse_move (see love.mousemoved)
```

resolve conflicts

Dependencies

In channels

Change contents

Solving an order conflict in reference.md at line 84 [4.17]

Deletion in reference.md at line 85 [4.17]

Solving an order conflict in main.lua at line 198 [5.2]

Deletion in main.lua at line 200 [5.2]

Deletion in 0001-on at line 14 [11.73]