akkartik/template-carousel-mobile - Change JZTUZQ35KJPQXO6BZN5QHX74CL5B64W4JRT2IVD2GUPI4RZTTYXAC

Template repo for tiny cross-platform apps that can be modified on phone, tablet or computer.

resolve conflicts

Created by akkartik on November 12, 2023

JZTUZQ35KJPQXO6BZN5QHX74CL5B64W4JRT2IVD2GUPI4RZTTYXAC

Dependencies

In channels

main

Change contents

Deletion in main.lua at line 155 [6.2]
B:BD[5.54] → [2.11:11]
B:BD[7.5763] → [4.18:18]
BD:BD[7.5763] → [4.18:18]
Solving an order conflict in main.lua at line 155 [6.2]
[5.54]
[6.183]
Deletion in main.lua at line 166 [6.2]
B:BD[9.40] → [3.247:247]
B:BD[7.6071] → [4.20:20]
BD:BD[7.6071] → [4.20:20]
Solving an order conflict in main.lua at line 166 [6.2]
[9.40]
[6.416]
Deletion in main.lua at line 228 [6.2]
B:BD[10.1283] → [3.249:249]
B:BD[11.67] → [4.24:24]
BD:BD[11.67] → [4.24:24]
Solving an order conflict in main.lua at line 228 [6.2]
[10.1283]
[12.223]
Deletion in main.lua at line 252 [6.2]
B:BD[13.87] → [3.291:291]
B:BD[14.507] → [4.26:26]
BD:BD[14.507] → [4.26:26]
B:BD[7.3019] → [4.16:16]
BD:BD[7.3019] → [4.16:16]
B:BD[7.2814] → [4.14:14]
BD:BD[7.2814] → [4.14:14]
B:BD[7.2567] → [4.12:12]
BD:BD[7.2567] → [4.12:12]
Solving an order conflict in main.lua at line 252 [6.2]
[13.87]