Fixes merge conflict

Browse Source

...

This commit is contained in:

Qwertytoforty

2021-06-28 19:10:41 -04:00

parent 134a2ddba5

commit 0ce9e4d2d9

1 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/inhands/items_lefthand.dmi

BIN

Binary file not shown.

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