mozilla/socorro — pull request #2520 by peterbe (2014-12-18 14:16:07+00:00)
Title: fixes bug 1112932 - conflict markers in topchangers.html

@lonnen r?

I used this commit to try to figure out which one you preferred
https://github.com/mozilla/socorro/commit/51be65478f21edff658efed8ff83807e4833eeb5