Remove conflict from mod
commit087550d9baf27149278cd82790c29dcf2c1b4688
authorMiloslav Ciz <drummyfish@disroot.org>
Thu, 16 Nov 2023 18:26:40 +0000 (16 19:26 +0100)
committerMiloslav Ciz <drummyfish@disroot.org>
Thu, 16 Nov 2023 18:26:40 +0000 (16 19:26 +0100)
tree935de84abf738d4e6f1625cf692c841398cb6491
parent871033fabcd0a39eeb8418bcf429c7635488ccc0
Remove conflict from mod
mods/particle_effects.diff