search

philipwalton / html-inspector

HTML Inspector is a code quality tool to help you and your team write better markup. It's written in JavaScript and runs in the browser, so testing your HTML has never been easier.
2.32k stars 145 forks source link

remove merge/conflict lines #27

Closed kimptoc closed 11 years ago

kimptoc commented 11 years ago

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

philipwalton commented 11 years ago

Weird, that's what happens when you try to merge pull requests on vacation.

philipwalton commented 11 years ago

Thanks.