akkartik/view.love - Change ZF5DELM2SE54JT7MLNVZLBQ6O7L37NLOTM6LGMJSUM4DUWA43O4QC

resolve conflicts

Created by akkartik on May 6, 2025

ZF5DELM2SE54JT7MLNVZLBQ6O7L37NLOTM6LGMJSUM4DUWA43O4QC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in text.lua at line 125 [7.1]

B:B[5.1568] → [6.3:139]

BD:B[5.1568] → [6.3:139]

function Text.text_input(State, t)
  if App.mouse_down(1) then return end
  if App.any_modifier_down() then
    if App.key_down(t) then

Resurrecting zombie bytes in text.lua at line 130 [7.1]

∅:∅[3.79] → [6.216:385]

B:B[6.216] → [6.216:385]

BD:B[6.216] → [6.216:385]

      return
    else
      -- Key mutated by the keyboard layout. Continue below.
    end
  end
end
-- Don't handle any keys here that would trigger text_input above.

Deletion in text.lua at line 138 [7.1]
B:BD[6.385] → [3.81:81]
BD:BD[6.385] → [3.81:81]
∅:D[9.4] → [10.1137:1180]
∅:D[11.80] → [10.1137:1180]
∅:D[3.81] → [10.1137:1180]
∅:D[6.385] → [10.1137:1180]
∅:D[12.1028] → [10.1137:1180]
B:BD[10.1137] → [10.1137:1180]
BD:BD[10.1137] → [10.1137:1180]
```
function Text.keychord_press(State, chord)
```
Resurrecting zombie bytes in text.lua at line 138 [7.1]
B:B[10.1137] → [8.0:69]
BD:B[10.1137] → [8.0:69]
```
function Text.keychord_press(State, chord, key, scancode, is_repeat)
```
Solving an order conflict in text.lua at line 138 [7.1]
[6.385]
[8.0]
Deletion in main.lua at line 313 [15.2]
B:BD[13.234] → [14.94:171]
BD:BD[13.234] → [14.94:171]
```
    if source.mouse_release then source.mouse_release(x,y, mouse_button) end
```
Resurrecting zombie bytes in main.lua at line 321 [15.2]
∅:∅[16.889] → [17.925:956]
∅:∅[16.889] → [17.925:956]
∅:∅[19.1144] → [17.925:956]
∅:∅[20.1404] → [17.925:956]
B:B[17.925] → [17.925:956]
B:B[17.925] → [17.925:956]
BD:B[16.889] → [17.925:956]
```
  if Current_app == 'run' then
```
Resurrecting zombie bytes in main.lua at line 323 [15.2]
∅:∅[14.272] → [17.1021:1059]
∅:∅[14.272] → [17.1021:1059]
∅:∅[16.961] → [17.1021:1059]
∅:∅[16.961] → [17.1021:1059]
∅:∅[4.2664] → [17.1021:1059]
B:B[16.961] → [17.1021:1059]
B:B[17.1021] → [17.1021:1059]
B:B[17.1021] → [17.1021:1059]
BD:B[14.272] → [17.1021:1059]
BD:B[17.1021] → [17.1021:1059]
```
  elseif Current_app == 'source' then
```

resolve conflicts

Dependencies

In channels

Change contents

Resurrecting zombie bytes in text.lua at line 125 [7.1]

Resurrecting zombie bytes in text.lua at line 130 [7.1]

Deletion in text.lua at line 138 [7.1]

Resurrecting zombie bytes in text.lua at line 138 [7.1]

Solving an order conflict in text.lua at line 138 [7.1]

Deletion in main.lua at line 313 [15.2]

Resurrecting zombie bytes in main.lua at line 321 [15.2]

Resurrecting zombie bytes in main.lua at line 323 [15.2]