akkartik/template-carousel-mobile - Change TQ6UMSTJHWP5M36RYYHIGLI62BCXQTDEMHRBUG75DMM735RH7FXAC

resolve conflicts

Created by akkartik on May 19, 2025

TQ6UMSTJHWP5M36RYYHIGLI62BCXQTDEMHRBUG75DMM735RH7FXAC

Dependencies

In channels

main

Change contents

File deletion: conf.lua, conf.lua, conf.lua.T42Y5MLOV7WMU, conf.lua, conf.lua
BFD:BFD[8.2] → [9.0:32]
BFD:BFD[8.2] → [9.0:32]
BF:BFD[9.32] → [9.33:33]
BF:BFD[8.2] → [6.18:64]
BF:BFD[6.64] → [9.33:33]
BFD:BFD[8.2] → [9.0:32]
BFD:BFD[8.2] → [9.0:32]
BFD:BFD[9.32] → [9.33:33]

Deletion in README.md at line 122 [10.6]

B:BD[3.33] → [3.33:76]

B:BD[11.26] → [7.26:155]

BD:BD[11.26] → [7.26:155]

* https://git.sr.ht/~akkartik/sokoban.love
* https://git.sr.ht/~akkartik/template-carousel-mobile -- A template repo for
  developing cross-platform apps on mobile devices

Solving an order conflict in README.md at line 122 [10.6]
[3.33]

Insertion in README.md at line 122 [10.6]

[0.33]

[12.814242]

* https://git.sr.ht/~akkartik/sokoban.love -- a cross-platform client for Sokoban puzzles.

Deletion in README.md at line 128 [10.6]
B:BD[13.132] → [4.3:3]
B:BD[13.132] → [7.157:157]

resolve conflicts

Dependencies

In channels

Change contents

File deletion: conf.lua, conf.lua, conf.lua.T42Y5MLOV7WMU, conf.lua, conf.lua

Deletion in README.md at line 122 [10.6]

Solving an order conflict in README.md at line 122 [10.6]

Insertion in README.md at line 122 [10.6]

Deletion in README.md at line 128 [10.6]