akkartik/mastodon-unfurl.love - Change G2LAMLBUE5WQUYUCB5RTS2STJEJHF2Q4JMX56Y5TYQKUXHCIJ4EQC

resolve conflicts

Created by akkartik 2 days ago

G2LAMLBUE5WQUYUCB5RTS2STJEJHF2Q4JMX56Y5TYQKUXHCIJ4EQC

Dependencies

In channels

main

Change contents

Deletion in edit.lua at line 9 [5.413]

B:BD[4.103] → [3.33:130]

BD:BD[4.103] → [3.33:130]


Hand_icon = love.mouse.getSystemCursor('hand')
Arrow_icon = love.mouse.getSystemCursor('arrow')

Deletion in edit.lua at line 449 [5.413]

B:BD[7.12430] → [2.3270:3270]

B:BD[8.4252] → [3.159:333]

BD:BD[8.4252] → [3.159:333]

BD:BD[8.4252] → [3.159:333]

  local x, y = love.mouse.getPosition()
  if mouse_hover_on_any_button(State, x,y) then
    love.mouse.setCursor(Hand_icon)
  else
    love.mouse.setCursor(Arrow_icon)
  end

Solving an order conflict in edit.lua at line 449 [5.413]
[7.12430]