Fix conflict
[akkoma] / test / web / views / error_view_test.exs
2018-04-01 KANEKO YoshitakaFix conflict
2018-03-30 lainFormat the code.
2017-03-17 Roger BraunPhoenix skeleton