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

Sign in to participate in the conversation

An instance of the Mastodon microblogging social network for Ice type pokemon, fans of Ice type pokemon, and anyone else who's, well, cool. Chat with our community here, or with your friends on any other instance! Our code of conduct page can be found here!