Fix and test fix for git collisions

codeforamerica / chime

A city-focused content management system

http://chimecms.org/

BSD 3-Clause "New" or "Revised" License

35 stars 12 forks source link

Closed tmaybe closed 8 years ago

tmaybe commented 8 years ago

This PR includes changes from branch fix-git-collisions-#455

It fixes the git collisions that are causing many of the errors we're seeing from the live Chime instances and tests the fix.

Will be ready to merge when I figure out how to raise exceptions that happen inside of asynchronous processes.

Closes #455

tmaybe commented 8 years ago

This is ready for review & merge when Travis tests pass