Commit 80aa0a8f authored by Bryce Johnson's avatar Bryce Johnson

Revert conflict resolution in routes.rb.

parent 0f57245f
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment