Fix merge conflicts

Browse Source

Fixes merge conflicts with icons\mob\head.dmi and icons\mob\suit.dmi

...

This commit is contained in:

DZD

2015-02-08 19:49:23 -05:00

parent 4a751c6846

commit e720ab7140

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

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 163 KiB After Width:  |  Height:  |  Size: 164 KiB

icons/mob/suit.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 295 KiB After Width:  |  Height:  |  Size: 299 KiB