CivicTechAtlanta / connector

A management tool for the brigade's projects
BSD 3-Clause "New" or "Revised" License
4 stars 12 forks source link

Removes events from the site #14

Closed witbok closed 10 years ago

witbok commented 10 years ago

I went through the code and tried to remove all of the events references... let me know if I missed any

sb8244 commented 10 years ago

:+1:

You have a merge conflict with master. Do this:

git checkout master
git pull origin master
git checkout remove-events
git merge master

Then fix the conflicts and you should be good. If your conflict is db/schema.rb, run rake db:migrate to resolve the conflict.

witbok commented 10 years ago

I fixed the merge conflict so now we are good to go.