conflict fix 2/2

Browse Source

Dat garmasons...

...

This commit is contained in:

Aurorablade

2015-12-12 18:59:20 -05:00

parent 31b90ffffb

commit 6a995ae906

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

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 9.9 KiB After Width:  |  Height:  |  Size: 10 KiB

icons/obj/clothing/glasses.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.9 KiB After Width:  |  Height:  |  Size: 8.2 KiB