Remove conflict from mod
commit688fc634b836d745571a7491093e53b02cf4b4b9
authorMiloslav Ciz <drummyfish@disroot.org>
Thu, 16 Nov 2023 18:33:46 +0000 (16 19:33 +0100)
committerMiloslav Ciz <drummyfish@disroot.org>
Thu, 16 Nov 2023 18:33:46 +0000 (16 19:33 +0100)
tree34de4a569a39bf1e7ca5f3dc763a9fbbc45c5589
parent087550d9baf27149278cd82790c29dcf2c1b4688
Remove conflict from mod
mods/terminal_messages.diff