fix conflict

This commit is contained in:
yw4z
2025-11-18 18:41:08 +03:00
parent 24fa9db594
commit f15bd4f8ff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 49 KiB