fixes conflict

Browse Source

...

This commit is contained in:

ItzGabby

2021-03-19 02:42:17 -04:00

parent 3fed89b16d

commit 23d5b3377b

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

BIN

icons/mob/clothing/suit.dmi

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 470 KiB After Width:  |  Height:  |  Size: 472 KiB

BIN

icons/obj/clothing/suits.dmi

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 169 KiB After Width:  |  Height:  |  Size: 170 KiB