akkartik/spell-cards.love - Change F7YD5D7I4PLEP6HPJZATKPULPKB5XX5EMNXQNJXNYFE2ZKYGPGCAC

resolve conflicts

Created by akkartik 2 days ago

F7YD5D7I4PLEP6HPJZATKPULPKB5XX5EMNXQNJXNYFE2ZKYGPGCAC

Dependencies

[2] 67PWAM7GNOQ7VPRXZAMYR62OG7IMEBEBCSE2ARUCZHWG7IZO5MMAC
[3] A27ZAO4OND7CPGMS6PHEQQCX5WR3WC22PCA7HERX7M4X6GRTKYHQC
[4] R5QXEHUIZLELJGGCZAE7ATNS3CLRJ7JFRENMGH4XXH24C5WABZDQC
[5] JOPVPUSAMMU6RFVDQR4NJC4GNNUFB7GPKVH7OS5FKCYS5QZ53VLQC
[6] D4B52CQ2QKG2HQKFUQOO5S2ME325DTW3PH2D7SBXCW4BPQFYG7CAC

In channels

main

Change contents

File deletion: source_text.lua, source_text.lua

BFD:BFD[4.2] → [5.147125:147164]

BFD:BFD[5.147164] → [5.83786:83786]

B:BD[6.21361] → [3.12:111]

B:BD[5.101716] → [3.112:158]

∅:D[3.158] → [5.101755:101828]

∅:D[3.111] → [6.21361:21382]

      return
    end
    if State.cursor1.line == 1 and State.cursor1.pos == 1 then
      -- no-op
    else
      assert(State.cursor1.line > 1)
      before = snapshot(State, State.cursor1.line-1, State.cursor1.line)
      return
    end