Commit 6a3d05a9 authored by tiagonbotelho's avatar tiagonbotelho

fixes merge conflicts for Gemfile.lock

parent 908eabeb
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