Actually fixes merge conflicts

Browse Source

...

This commit is contained in:

IK3I

2017-05-27 21:45:54 -05:00

parent d5a0b1e0b7 1987522950

commit 2ebf7a2943

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

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 207 KiB After Width:  |  Height:  |  Size: 197 KiB

icons/obj/custom_items.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 72 KiB After Width:  |  Height:  |  Size: 66 KiB