codeforamerica / fast_pass

Las Vegas Development Opportunity Finder
BSD 3-Clause "New" or "Revised" License
7 stars 4 forks source link

Verify merge worked #37

Closed louh closed 11 years ago

louh commented 11 years ago

@rclosner

I tried to merge everything you did and everything I did, all back into master. I think it worked, but I also noticed that in your branch you changed the controllers to refer to the new backend endpoints, which I think got overwritten by my slew of edits. I'm not sure how to go back and check. Maybe you can do it faster?

This brings up the follow up question for when I'm trying to test this. How do I spin up the backend database?