philipwalton/html-inspector — pull request #27 by kimptoc (2013-08-14 07:33:29+00:00)
Title: remove merge/conflict lines

You probably have this removed already, but if not - here you go :)