akkartik/sokoban.love - Change FYRGHNLC4YQBRP7OZMPILETW6T4BXINL3VDVWKWP3B6NBCBT7A7QC

resolve conflicts

Created by akkartik on December 19, 2023

FYRGHNLC4YQBRP7OZMPILETW6T4BXINL3VDVWKWP3B6NBCBT7A7QC

Dependencies

[2] CSXIZ4FAELRZLG75S7B5R6TMWMASBK7VQ5R7B6NOUBIWMBLXK5KQC
[3] UQI34GQFLN3YSDDBVNABM7VX5UKGIDBKD2AWGGEVR4QAMHMPKJ3AC
[4] R5QXEHUIZLELJGGCZAE7ATNS3CLRJ7JFRENMGH4XXH24C5WABZDQC
[5] KKMFQDR43ZWVCDRHQLWWX3FCWCFA3ZSXYOBRJNPHUQZR2XPKWULAC
[6] GZ5WULJVEZJJQPQPSQZE7CEPIYPJ2BJDYUJBMZRA5HLOO7TE3DOQC
[7] KWIVKQQ7AANRG6R4ZRB5TDBZ2TZTXAXIR2P6JNT362KIAJ7JQ4VQC
[8] 7YGYHOEOWGHRJ54YP6EEHVAGLUWMDATSRUC4IH4XRRHUBBRZQSVAC
[9] JOPVPUSAMMU6RFVDQR4NJC4GNNUFB7GPKVH7OS5FKCYS5QZ53VLQC

In channels

main

Change contents

File deletion: source_text.lua, source_text.lua

BFD:BFD[4.2] → [5.147062:147101]

BFD:BFD[5.147101] → [5.83723:83723]

B:BD[6.869] → [3.8:93]

∅:D[3.93] → [6.969:1233]

          button(State, 'link', {x=State.left+lo, y=y, w=hi-lo, h=State.line_height,
            icon = icon.hyperlink_decoration,
            onpress1 = function()
                         if file_exists(filename) then
                           source.switch_to_file(filename)
                         end
                       end,
          })

Replacement in source_text.lua at line 37 [9.83786]

B:BD[7.869] → [8.8:111]

          button(State, 'link', {x=State.left+lo, y=y, w=hi-lo, h=State.line_height, bg={r=1,g=1,b=1},

[7.869]

[7.969]

          button(State, 'link', {x=State.left+lo, y=y, w=hi-lo, h=State.line_height,