Commit a1f9ecbb authored by Rafael Masoni's avatar Rafael Masoni
Browse files

Solving conflicts.

parent 1e5e52e8
......@@ -25,5 +25,4 @@ gem 'factory_girl_rails'
gem 'unicorn'
gem 'pry'
gem 'newrelic_rpm'
gem 'heroku'
......@@ -198,7 +198,6 @@ DEPENDENCIES
jbuilder
jquery-rails
mongoid (~> 3.0.0)
newrelic_rpm
omniauth
omniauth-twitter
pry
......
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