akkartik/template-live-editor - Change LHG2QWSOMAYE4RTOFLL5H53GHUFBUOSEM3Y4TL343IENBOAHG6GAC

Fork of lines.love for live programming; useful starting point for further forks

resolve conflicts

Created by akkartik on November 12, 2023

LHG2QWSOMAYE4RTOFLL5H53GHUFBUOSEM3Y4TL343IENBOAHG6GAC

Dependencies

In channels

main

Change contents

Deletion in main.lua at line 89 [5.2]
B:BD[4.186894] → [3.38:75]
BD:BD[4.186894] → [3.38:75]
```
  elseif Current_app == 'error' then
```
Insertion in main.lua at line 95 [5.2]
[7.186411]
[7.186411]
```
  elseif Current_app == 'error' then
```
Insertion in main.lua at line 139 [5.2]
[8.4536]
[7.187341]
```
  elseif Current_app == 'error' then
```

Replacement in main.lua at line 160 [5.2]

B:BD[9.1373] → [2.511:544]

  if Current_app == 'error' then

[9.1373]

[2.544]

  if Current_app == 'run' then
    run.draw()
  elseif Current_app == 'source' then
    source.draw()
  elseif Current_app == 'error' then

Deletion in main.lua at line 169 [5.2]
B:BD[2.742] → [2.742:777]
∅:D[2.777] → [7.187814:187885]
B:BD[7.187814] → [7.187814:187885]
```
  elseif Current_app == 'run' then
    run.draw()
  elseif Current_app == 'source' then
    source.draw()
```

Deletion in main.lua at line 172 [5.2]

B:BD[7.187951] → [2.779:779]

B:BD[9.1373] → [3.228:367]

BD:BD[9.1373] → [3.228:367]

  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 172 [5.2]
[7.187951]
[5.416]
Deletion in main.lua at line 323 [5.2]
B:BD[10.268] → [2.1042:1042]
B:BD[8.4536] → [3.152:189]
BD:BD[8.4536] → [3.152:189]
```
  elseif Current_app == 'error' then
```
Solving an order conflict in main.lua at line 323 [5.2]
[10.268]