fixing annoying merge conflicts

Browse Source

...

This commit is contained in:

zerothebigboy

2021-02-14 10:48:56 -05:00

parent b9f7acf99c

commit 7b227e5d3e

3 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/feet.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 29 KiB After Width:  |  Height:  |  Size: 28 KiB

icons/mob/clothing/suit.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 468 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: 164 KiB After Width:  |  Height:  |  Size: 166 KiB