subiendo app rails
Merge branch 'master' of heroku.com:zamurozurb
Bundle update rails
Bundle update rails
Bundle update rails
arreglando error de merge