akkartik/wardley.love - Change BUQ7LJAHAR5RTOSCJBEBQPLZYPLL4CH55DFOSXUKGNNLAHPS5BPQC

resolve conflicts

Created by akkartik on October 9, 2023

BUQ7LJAHAR5RTOSCJBEBQPLZYPLL4CH55DFOSXUKGNNLAHPS5BPQC

Dependencies

In channels

main

Change contents

Replacement in main.lua at line 19 [5.2]

B:BD[2.169] → [2.169:240]

  local major, minor = love.getVersion()
  Version = major..'.'..minor

[2.169]

[2.240]

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

Deletion in main.lua at line 267 [5.2]
B:BD[6.190738] → [4.813:857]
BD:BD[6.190738] → [4.813:857]
∅:D[7.7809] → [8.264:268]
∅:D[6.191241] → [8.264:268]
∅:D[9.191780] → [8.264:268]
B:BD[8.264] → [8.264:268]
B:BD[8.268] → [3.0:0]
B:BD[8.268] → [4.858:858]
B:BD[6.190074] → [4.720:764]
BD:BD[6.190074] → [4.720:764]
B:BD[10.355] → [4.765:765]
BD:BD[10.355] → [4.765:765]
BD:BD[10.355] → [4.765:765]
B:BD[13.889] → [4.766:766]
BD:BD[13.889] → [4.766:766]
BD:BD[13.889] → [4.766:766]
BD:BD[13.889] → [4.766:766]
∅:D[4.766] → [15.1340:1384]
B:BD[16.925] → [15.1340:1384]
BD:BD[16.925] → [15.1340:1384]
BD:BD[16.925] → [15.1340:1384]
B:BD[17.115] → [15.0:6]
BD:BD[17.115] → [15.0:6]
```
  if Current_app == 'error' then return end
end
  if Current_app == 'error' then return end
  if Current_app == 'error' then return end
  end
```
Resurrecting zombie bytes in main.lua at line 267 [5.2]
B:B[15.6] → [15.6:10]
BD:B[15.6] → [15.6:10]
```
end
```
Solving an order conflict in main.lua at line 267 [5.2]
[18.170]
[15.6]

Deletion in main.lua at line 268 [5.2]

B:BD[15.10] → [15.10:756]

BD:BD[15.10] → [15.10:756]


function App.version_check()
  -- available modes: run, error
  Error_message = nil
  Error_count = 0
  -- we'll reuse error mode on load for an initial version check
  local supported_versions = {'11.4', '12.0'}  -- put the recommended version first
  local minor_version
  Major_version, minor_version = love.getVersion()
  Version = Major_version..'.'..minor_version
  if array.find(supported_versions, Version) == nil then
    Current_app = '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

Resurrecting zombie bytes in app.lua at line 10 [19.2]
B:B[19.54] → [2.1125:1147]
BD:B[19.54] → [2.1125:1147]
∅:∅[2.1147] → [20.4069:4091]
B:B[19.54] → [20.4069:4091]
BD:B[19.54] → [20.4069:4091]
BD:B[2.1147] → [20.4069:4091]
```
  App.version_check()
  App.snapshot_love()
```

resolve conflicts

Dependencies

In channels

Change contents

Replacement in main.lua at line 19 [5.2]

Deletion in main.lua at line 267 [5.2]

Resurrecting zombie bytes in main.lua at line 267 [5.2]

Solving an order conflict in main.lua at line 267 [5.2]

Deletion in main.lua at line 268 [5.2]

Resurrecting zombie bytes in app.lua at line 10 [19.2]