1112932 - conflict markers in topchangers.html

Status: RESOLVED FIXED

(Socorro :: Webapp, task)

Description

[Robert Helmer [:rhelmer]]

A non-mozilla Socorro user pointed out that we have conflict markers checked into https://github.com/mozilla/socorro/blob/8a9934bd330c8ef8e5d71c4493fa88d56f01d3ee/webapp-django/crashstats/crashstats/templates/crashstats/topchangers.html

Comment 1

[Peter Bengtsson [:peterbe]]

PR https://github.com/mozilla/socorro/pull/2520

Interestingly, this is the second time my django-html-validator could have helped. If it just wasn't so darn slow!

Comment 2

[Robert Helmer [:rhelmer]]

Already opened PR https://github.com/mozilla/socorro/pull/2518 :)

Comment 3

[Robert Helmer [:rhelmer]]

(In reply to Peter Bengtsson [:peterbe] from comment #1)
> PR https://github.com/mozilla/socorro/pull/2520
> 
> Interestingly, this is the second time my django-html-validator could have
> helped. If it just wasn't so darn slow!

(In reply to Robert Helmer [:rhelmer] from comment #2)
> Already opened PR https://github.com/mozilla/socorro/pull/2518 :)

I think peterbe's is correct, closed 2518

Comment 4

[Lonnen :lonnen]

well that's embarrassing.

Comment 5

[[github robot]]

Commits pushed to master at https://github.com/mozilla/socorro

https://github.com/mozilla/socorro/commit/4a2dc018ba27e233a15418590f812a6f5ca618f9
fixes bug 1112932 - conflict markers in topchangers.html

https://github.com/mozilla/socorro/commit/350b5f6d0a50743a6e43161ea94dd135c99dacb4
Merge pull request #2520 from peterbe/bug-1112932-conflict-markers-in-topchangershtml

fixes bug 1112932 - conflict markers in topchangers.html