Fixes merge conflict

Browse Source

...

This commit is contained in:

TheFlagbearer

2015-05-27 16:46:44 -04:00

parent b24c1a783f

commit c3deedf036

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

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 281 KiB After Width:  |  Height:  |  Size: 282 KiB

icons/obj/clothing/uniforms.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 68 KiB After Width:  |  Height:  |  Size: 69 KiB