akkartik/wardley.love - Change J6EXTDKMRGCK64V2VI352N4MDNHQA6YRKEJ34RNAQ22ZAT2DEGIQC

resolve conflicts

Created by akkartik on October 10, 2023

J6EXTDKMRGCK64V2VI352N4MDNHQA6YRKEJ34RNAQ22ZAT2DEGIQC

Dependencies

In channels

main

Change contents

Deletion in main.lua at line 21 [6.2]

∅:D[2.161] → [5.63:169]

B:BD[5.63] → [5.63:169]

  Supported_versions = {'11.4', '11.3', '11.2', '11.1', '11.0'}  -- keep these sorted in descending order

Resurrecting zombie bytes in main.lua at line 21 [6.2]

B:B[5.240] → [2.162:530]

BD:B[5.240] → [2.162:530]

  if array.find(Supported_versions, Version) == nil then
    Mode = 'error'
    Error_message = ("This app doesn't support version %s; please use version %s. Press any key to try it with this version anyway."):format(Version, Supported_versions[1])
    print(Error_message)
    -- continue initializing everything; hopefully we won't have errors during initialization

Insertion in main.lua at line 21 [6.2]

[2.161]

[2.162]

  Supported_versions = {'11.4', '11.3', '11.2', '11.1', '11.0', '12.0'}  -- keep these sorted in descending order
  local minor_version
  Major_version, minor_version = love.getVersion()
  Version = Major_version..'.'..minor_version

Deletion in main.lua at line 30 [6.2]

B:BD[5.169] → [3.0:119]

BD:BD[5.169] → [3.0:119]

  local minor_version
  Major_version, minor_version = love.getVersion()
  Version = Major_version..'.'..minor_version

Solving an order conflict in main.lua at line 30 [6.2]
[2.530]
[5.307]
Deletion in main.lua at line 40 [6.2]
∅:D[3.120] → [7.6:10]
B:BD[7.6] → [7.6:10]
```
end
```

Deletion in main.lua at line 158 [6.2]

B:BD[8.1373] → [5.319:664]

BD:BD[8.1373] → [5.319:664]

  if Mode == 'version_check' then
    love.graphics.setColor(1,1,0)
    love.graphics.rectangle('fill', 30,30, 400,400)
    love.graphics.setColor(0,0,0)
    love.graphics.printf(("This app doesn't support version %s; please use version %s. Press any key to try it with this version anyway."):format(Version, Supported_versions[1]), 40,40, 400)

Resurrecting zombie bytes in main.lua at line 165 [6.2]
B:B[5.681] → [9.8:40]
BD:B[5.681] → [9.8:40]
BD:B[5.681] → [9.8:40]
```
  if on.draw then on.draw() end
```
Deletion in main.lua at line 166 [6.2]
∅:D[9.40] → [11.46:46]
∅:D[12.224] → [11.46:46]
D:D[13.6071] → [11.46:46]
BD:BD[14.187951] → [11.46:46]
∅:D[5.681] → [13.6045:6071]
B:BD[5.681] → [13.6045:6071]
B:BD[8.1373] → [13.6045:6071]
BD:BD[8.1373] → [13.6045:6071]
B:BD[13.6071] → [4.0:0]
BD:BD[13.6071] → [4.0:0]
```
  edit.draw(Editor_state)
```
Solving an order conflict in main.lua at line 166 [6.2]
[9.40]
[6.416]

resolve conflicts

Dependencies

In channels

Change contents

Deletion in main.lua at line 21 [6.2]

Resurrecting zombie bytes in main.lua at line 21 [6.2]

Insertion in main.lua at line 21 [6.2]

Deletion in main.lua at line 30 [6.2]

Solving an order conflict in main.lua at line 30 [6.2]

Deletion in main.lua at line 40 [6.2]

Deletion in main.lua at line 158 [6.2]

Resurrecting zombie bytes in main.lua at line 165 [6.2]

Deletion in main.lua at line 166 [6.2]

Solving an order conflict in main.lua at line 166 [6.2]