akkartik/carousel.love - Change EBRL7VKRBTW7VNIADHVR7UNP5L24S74TTWRWYKNT2OH4K4ZRAIOQC

resolve conflicts

Created by akkartik on January 22, 2024

EBRL7VKRBTW7VNIADHVR7UNP5L24S74TTWRWYKNT2OH4K4ZRAIOQC

Dependencies

In channels

main

Change contents

Replacement in text.lua at line 49 [6.1]

B:BD[5.145] → [5.145:251]

              Text.pretend_draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y)

[5.145]

[5.251]

              Text.pretend_draw_cursor(State, State.left+Text.x(State.font, screen_line, State.cursor1.pos-pos+1), y)

Replacement in text.lua at line 51 [6.1]

B:BD[5.268] → [2.4:116]

              Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y, Cursor_color)

[5.268]

[5.384]

              Text.draw_cursor(State, State.left+Text.x(State.font, screen_line, State.cursor1.pos-pos+1), y, Cursor_color)

Replacement in text.lua at line 58 [6.1]

B:BD[5.738] → [5.738:844]

              Text.pretend_draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y)

[5.738]

[5.844]

              Text.pretend_draw_cursor(State, State.left+Text.x(State.font, screen_line, State.cursor1.pos-pos+1), y)

Replacement in text.lua at line 60 [6.1]

B:BD[5.861] → [2.117:229]

              Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y, Cursor_color)

[5.861]

[5.977]

              Text.draw_cursor(State, State.left+Text.x(State.font, screen_line, State.cursor1.pos-pos+1), y, Cursor_color)

Deletion in text.lua at line 62 [6.1]

B:BD[7.169] → [8.4:112]

BD:BD[7.169] → [8.4:112]

B:BD[7.571] → [8.113:221]

BD:BD[7.571] → [8.113:221]

            Text.draw_cursor(State, State.left+Text.x(State.font, screen_line, State.cursor1.pos-pos+1), y)
            Text.draw_cursor(State, State.left+Text.x(State.font, screen_line, State.cursor1.pos-pos+1), y)

Solving an order conflict in text.lua at line 62 [6.1]
[5.993]
[9.530]

Replacement in search.lua at line 16 [11.48846]

B:BD[10.1671] → [2.287:364]

B:BD[10.1671] → [8.4596:4669]

  Text.draw_cursor(State, 25+App.width(State.search_term),y-5, Cursor_color)
  Text.draw_cursor(State, 25+State.font:getWidth(State.search_term),y-5)

[10.1671]

[11.49698]

  Text.draw_cursor(State, 25+State.font:getWidth(State.search_term),y-5, Cursor_color)

Deletion in main.lua at line 271 [13.2]
B:BD[12.243] → [12.243:247]
B:BD[12.247] → [3.13:13]
BD:BD[12.247] → [3.13:13]
∅:D[3.13] → [14.55:151]
B:BD[15.1581] → [14.55:151]
BD:BD[15.1581] → [14.55:151]
B:BD[16.336] → [4.12:12]
BD:BD[16.336] → [4.12:12]
```
end
function warning_message()
  assert(type(Current_app) == 'table')
  return Current_app.message
```
Resurrecting zombie bytes in main.lua at line 271 [13.2]
∅:∅[4.12] → [14.151:155]
B:B[14.151] → [14.151:155]
BD:B[14.151] → [14.151:155]
```
end
```
Solving an order conflict in main.lua at line 271 [13.2]
[12.243]
[14.151]
Deletion in app.lua at line 552 [19.2]
B:BD[18.8166] → [4.20:20]
BD:BD[18.8166] → [4.20:20]

resolve conflicts

Dependencies

In channels

Change contents

Replacement in text.lua at line 49 [6.1]

Replacement in text.lua at line 51 [6.1]

Replacement in text.lua at line 58 [6.1]

Replacement in text.lua at line 60 [6.1]

Deletion in text.lua at line 62 [6.1]

Solving an order conflict in text.lua at line 62 [6.1]

Replacement in search.lua at line 16 [11.48846]

Deletion in main.lua at line 271 [13.2]

Resurrecting zombie bytes in main.lua at line 271 [13.2]

Solving an order conflict in main.lua at line 271 [13.2]

Deletion in app.lua at line 552 [19.2]