Fixes merge conf

This commit is contained in:
Fermi
2019-11-01 00:51:09 +00:00
parent 642b27a10f
commit 988a5a13bf
Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

After

Width:  |  Height:  |  Size: 53 KiB