mastodon.zunda.ninja is one of the many independent Mastodon servers you can use to participate in the fediverse.
Zundon is a single user instance as home of @zundan as well as a test bed for changes of the code.

Administered by:

Server stats:

1
active users

zunda

$ git merge --no-edit master
Auto-merging Gemfile
CONFLICT (content): Merge conflict in Gemfile
Automatic merge failed; fix conflicts and then commit the result.

ほーい

masterむっちゃ進んでますたー!!

<<<<<<< HEAD
ruby '>= 2.4.0', '< 2.8.0'
=======
ruby '>= 2.4.0', '< 3.0.0'
>>>>>>> master