Commit 6cd8bc57 authored by tiagonbotelho's avatar tiagonbotelho

fixes merge conflicts for Gemfile.lock

parent e3685823
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