akkartik/carousel.love - Change AFDLKNAPELPFZUV6LBOBTWTUGYLPDDCD6ALTQ2E3TG2MPFOG72JQC

resolve conflicts

Created by akkartik on November 12, 2023

AFDLKNAPELPFZUV6LBOBTWTUGYLPDDCD6ALTQ2E3TG2MPFOG72JQC

Dependencies

In channels

main

Change contents

Deletion in main.lua at line 33 [7.2]
B:BD[5.186724] → [6.0:37]
BD:BD[5.186724] → [6.0:37]
```
  elseif Current_app == 'error' then
```
Deletion in main.lua at line 34 [7.2]
B:BD[9.186411] → [4.20:57]
BD:BD[9.186411] → [4.20:57]
```
  elseif Current_app == 'error' then
```
Deletion in main.lua at line 49 [7.2]
B:BD[8.2567] → [2.77:77]
B:BD[5.187263] → [6.76:113]
BD:BD[5.187263] → [6.76:113]
```
  elseif Current_app == 'error' then
```
Solving an order conflict in main.lua at line 49 [7.2]
[8.2567]
[5.187263]
Deletion in main.lua at line 59 [7.2]
B:BD[5.187568] → [6.114:151]
BD:BD[5.187568] → [6.114:151]
```
  elseif Current_app == 'error' then
```
Solving an order conflict in main.lua at line 59 [7.2]
[8.2814]
[5.187568]
Deletion in main.lua at line 74 [7.2]
B:BD[8.3019] → [10.9:9]
B:BD[11.4536] → [4.58:95]
BD:BD[11.4536] → [4.58:95]
BD:BD[11.4536] → [4.58:95]
```
  elseif Current_app == 'error' then
```
Solving an order conflict in main.lua at line 74 [7.2]
[8.3019]
[9.187401]
Deletion in main.lua at line 151 [7.2]
B:BD[5.188255] → [6.190:227]
BD:BD[5.188255] → [6.190:227]
```
  elseif Current_app == 'error' then
```
Solving an order conflict in main.lua at line 151 [7.2]
[8.5763]
[5.188315]
Deletion in main.lua at line 180 [7.2]
B:BD[8.6071] → [3.132:132]
B:BD[12.1373] → [4.96:235]
BD:BD[12.1373] → [4.96:235]
B:BD[9.187951] → [4.237:237]
BD:BD[9.187951] → [4.237:237]
```
  if Current_app == 'run' then
    run.draw()
  elseif Current_app == 'source' then
    source.draw()
  elseif Current_app == 'error' then
```
Solving an order conflict in main.lua at line 180 [7.2]
[8.6071]
[7.416]
Deletion in main.lua at line 233 [7.2]
B:BD[5.188606] → [6.368:405]
BD:BD[5.188606] → [6.368:405]
```
  elseif Current_app == 'error' then
```
Solving an order conflict in main.lua at line 233 [7.2]
[13.82]
[5.188666]
Deletion in main.lua at line 244 [7.2]
B:BD[10.67] → [3.134:134]
B:BD[14.456] → [6.406:445]
BD:BD[14.456] → [6.406:445]
BD:BD[14.456] → [6.406:445]
```
    elseif Current_app == 'error' then
```
Solving an order conflict in main.lua at line 244 [7.2]
[10.67]
[16.223]
Deletion in main.lua at line 268 [7.2]
B:BD[17.507] → [3.140:140]
B:BD[18.268] → [4.239:239]
BD:BD[18.268] → [4.239:239]
Solving an order conflict in main.lua at line 268 [7.2]
[17.507]

resolve conflicts

Dependencies

In channels

Change contents

Deletion in main.lua at line 33 [7.2]

Deletion in main.lua at line 34 [7.2]

Deletion in main.lua at line 49 [7.2]

Solving an order conflict in main.lua at line 49 [7.2]

Deletion in main.lua at line 59 [7.2]

Solving an order conflict in main.lua at line 59 [7.2]

Deletion in main.lua at line 74 [7.2]

Solving an order conflict in main.lua at line 74 [7.2]

Deletion in main.lua at line 151 [7.2]

Solving an order conflict in main.lua at line 151 [7.2]

Deletion in main.lua at line 180 [7.2]

Solving an order conflict in main.lua at line 180 [7.2]

Deletion in main.lua at line 233 [7.2]

Solving an order conflict in main.lua at line 233 [7.2]

Deletion in main.lua at line 244 [7.2]

Solving an order conflict in main.lua at line 244 [7.2]

Deletion in main.lua at line 268 [7.2]

Solving an order conflict in main.lua at line 268 [7.2]