akkartik/sokoban.love - Change WKXJNESIMLTTUCTCT7Y32R4ESTKREY7L5JDZ43MWIPM5DVM47R5AC

Client for playing 300 publicly available Sokoban puzzles on a computer or phone.

resolve conflicts

Created by akkartik on December 2, 2023

WKXJNESIMLTTUCTCT7Y32R4ESTKREY7L5JDZ43MWIPM5DVM47R5AC

Dependencies

In channels

main

Change contents

Insertion in edit.lua at line 154 [5.413]
[4.1861]
[4.1861]
```
  State.mouse_down = mouse_button
```
Insertion in edit.lua at line 203 [5.413]
[4.3727]
[6.1929]
```
  State.mouse_down = nil
```
Deletion in edit.lua at line 458 [5.413]
B:BD[4.12430] → [2.8766:8766]
B:BD[7.2703] → [3.63:88]
BD:BD[7.2703] → [3.63:88]
BD:BD[7.2703] → [3.63:88]
B:BD[10.4581] → [3.28:62]
BD:BD[10.4581] → [3.28:62]
BD:BD[10.4581] → [3.28:62]
```
  State.mouse_down = nil
  State.mouse_down = mouse_button
```
Solving an order conflict in edit.lua at line 458 [5.413]
[4.12430]