SuperAmerica/agilefant — comment on commit 0da7020b70dcffa9d2172a159724273fac373b31
File: web/static/js/dynamics/controller/ProjectController.js line 774
By betelgeuse:

You forgot to properly resolve a conflict here and it has been part of the history since. @jebaldwin you might want to reserve time to read the git diff -w superamerica/master in future iterations to sanity check things. @danbolt when you start next iteration please reset your branch to superamerica/master so we don't carry the old commits around any more. Feel free to ask me for help if needed.