Timothy Teakettle eba1e8f301 fixes the merge conflicts

2020-06-15 23:29:49 +01:00

..

_flags.dm

fixes the merge conflicts

2020-06-15 23:29:49 +01:00

item_flags.dm

…

obj_flags.dm

…