Fixes the conflict

Browse Source

...

This commit is contained in:

necromanceranne

2021-01-09 19:06:16 +11:00

parent 9c0989d233

commit daafa721ce

2 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

icons/mob/clothing/suit.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 457 KiB After Width:  |  Height:  |  Size: 460 KiB

icons/obj/clothing/suits.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 162 KiB After Width:  |  Height:  |  Size: 163 KiB