fixing merge conflicts suuuucks and i have to do it every time i update mastodon

it's not hard unless there's actually a problem, but even when there's no problem it just sucks to do

Show thread
Sign in to participate in the conversation

The social network of the future: No ads, no corporate surveillance, ethical design, and decentralization! Own your data with Mastodon!