akkartik/etch.love - Change 2MJ5PFZSH2TZN5RGTMC2WSPXID3QXO4JCK2YE4YOC5IODXSPUTBAC

resolve conflicts

Created by akkartik on November 14, 2023

2MJ5PFZSH2TZN5RGTMC2WSPXID3QXO4JCK2YE4YOC5IODXSPUTBAC

Dependencies

In channels

main

Change contents

Replacement in run.lua at line 11 [7.178044]

B:BD[5.79] → [6.15:98]

  Ipad_menu_height = 25
  Menu_bar_height = Ipad_menu_height + 5 + Line_height + 5

[5.79]

  Menu_bar_height = Menu_top + 5 + Line_height + 5

Replacement in run.lua at line 126 [7.178044]

∅:D[8.54] → [9.1572:1584]

B:BD[9.1572] → [9.1572:1584]

B:BD[9.1584] → [3.16:124]

  local x=5
  button(Editor_state, button_text, {x=x, y=Ipad_menu_height, w=width+10,h=Line_height, bg={r=1,g=0.7,b=1},

[8.54]

[9.1674]

  local x=Menu_left+5
  button(Editor_state, button_text, {x=x, y=Menu_top, w=width+10,h=Line_height, bg={r=1,g=0.7,b=1},

Deletion in run.lua at line 147 [7.178044]

B:BD[8.88] → [3.126:126]

B:BD[3.126] → [3.127:235]

B:BD[10.418] → [4.0:88]

BD:BD[10.418] → [4.0:88]

  button(Editor_state, button_text, {x=x, y=Ipad_menu_height, w=width+10,h=Line_height, bg={r=1,g=0.7,b=1},
  button(Editor_state, 'open', {x=Menu_left, y=Menu_top, w=40,h=40, bg={r=1,g=0.7,b=1},

Solving an order conflict in run.lua at line 147 [7.178044]
[8.88]

Insertion in run.lua at line 147 [7.178044]

[0.192]

[10.639]

  button(Editor_state, button_text, {x=x, y=Menu_top, w=width+10,h=Line_height, bg={r=1,g=0.7,b=1},

Replacement in run.lua at line 163 [7.178044]

B:BD[9.2662] → [2.15:75]

    love.graphics.print(Current_flash, x, Ipad_menu_height)

[9.2662]

[9.2707]

    love.graphics.print(Current_flash, x, Menu_top)

Deletion in run.lua at line 169 [7.178044]
B:BD[11.341] → [6.315:347]
```
  local y = Ipad_menu_height+10
```