Back

へいへいほー

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

いぇいいぇいいぇいいぇい

<<<<<<< HEAD
gem 'rails-settings-cached', '~> 0.6', git: 'https:// github.com/zunda/rails-settings-cached.git', branch: 'v0.6.6-aliases-true'
=======
gem 'rails-settings-cached', '~> 0.6', git: 'https:// github.com/mastodon/rails-settings-cached.git', branch: 'v0.6.6-aliases-true'
>>>>>>> master

\Master?/ \ますたー/

Merged mastodon/mastodon at fb8503e861b630728ead4be847309f1fd7c03dd4.