19:33:41 web.1 | <<<<<<< HEAD
19:33:41 web.1 | ^~
19:33:41 web.1 | .../config/routes.rb:33: syntax error, unexpected ===, expecting end-of-input
merge conflict中には起動せんしw
19:33:41 web.1 | <<<<<<< HEAD
19:33:41 web.1 | ^~
19:33:41 web.1 | .../config/routes.rb:33: syntax error, unexpected ===, expecting end-of-input
merge conflict中には起動せんしw