fix conflicts.

Browse Source

...

This commit is contained in:

r4d6

2020-01-15 17:18:18 -05:00

parent e685c3fc09

commit 85e71c4d60

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/suit.dmi

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 396 KiB After Width:  |  Height:  |  Size: 397 KiB

BIN

icons/obj/clothing/suits.dmi

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 136 KiB After Width:  |  Height:  |  Size: 135 KiB