Revert "fixes conflict"

Browse Source

This reverts commit 23d5b3377b.

...

This commit is contained in:

ItzGabby

2021-03-19 02:43:30 -04:00

parent 23d5b3377b

commit b0abc6d726

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: 472 KiB After Width:  |  Height:  |  Size: 470 KiB

icons/obj/clothing/suits.dmi

BIN

Binary file not shown.

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