no more conflictx

This commit is contained in:
Aurorablade
2016-03-12 00:59:31 -05:00
parent cb20a1ca4f
commit e03ac2bf82
Binary file not shown.

Before

Width:  |  Height:  |  Size: 53 KiB

After

Width:  |  Height:  |  Size: 55 KiB