Attempt to resolve merge conflict
[akkoma] / priv / static / emoji / 2b1c.svg
priv/static/emoji/2b1c.svg