akkartik/techmeet.love - Change GQNTGHTYOMXGNBOHOVG3Y6F7XQGGKS6ZR75443ZFAPGOGF7NR45AC

Collaborative wiki for a few of us. Fork of lines.love.

resolve conflicts

Created by akkartik on November 12, 2023

GQNTGHTYOMXGNBOHOVG3Y6F7XQGGKS6ZR75443ZFAPGOGF7NR45AC

Dependencies

In channels

main

Change contents

Insertion in main.lua at line 72 [7.2]
[5.62552]
[6.824]
```
  elseif Current_app == 'error' then
```
Insertion in main.lua at line 100 [7.2]
[5.62724]
[8.72]
```
  elseif Current_app == 'error' then
```
Insertion in main.lua at line 121 [7.2]
[5.63091]
[5.63091]
```
  elseif Current_app == 'error' then
```
Deletion in main.lua at line 125 [7.2]
B:BD[9.186724] → [4.0:37]
BD:BD[9.186724] → [4.0:37]
BD:BD[9.186724] → [4.0:37]
```
  elseif Current_app == 'error' then
```
Deletion in main.lua at line 126 [7.2]
B:BD[9.186729] → [10.55:55]
B:BD[9.186894] → [4.38:75]
BD:BD[9.186894] → [4.38:75]
```
  elseif Current_app == 'error' then
```

Replacement in main.lua at line 165 [7.2]

B:BD[5.63194] → [3.780:813]

  if Current_app == 'error' then

[5.63194]

[3.813]

  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 174 [7.2]
B:BD[3.1011] → [3.1011:1046]
∅:D[3.1046] → [5.63225:63296]
∅:D[2.1597] → [5.63225:63296]
B:BD[5.63225] → [5.63225:63296]
```
  elseif Current_app == 'run' then
    run.draw()
  elseif Current_app == 'source' then
    source.draw()
```
Deletion in main.lua at line 185 [7.2]
B:BD[5.63493] → [3.1048:1048]
B:BD[11.1373] → [4.228:367]
BD:BD[11.1373] → [4.228:367]
BD:BD[11.1373] → [4.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 185 [7.2]
[5.63493]
[9.188491]
Deletion in main.lua at line 335 [7.2]
B:BD[13.268] → [3.1123:1123]
B:BD[9.187263] → [4.76:113]
BD:BD[9.187263] → [4.76:113]
```
  elseif Current_app == 'error' then
```
Solving an order conflict in main.lua at line 335 [7.2]
[13.268]