Closed witbok closed 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.
I fixed the merge conflict so now we are good to go.
I went through the code and tried to remove all of the events references... let me know if I missed any