Fix merge conflicts with upstream
[akkoma] / test / fixtures / image.png
test/fixtures/image.png