Remove missed merge conflict code.

Author: philipwalton

FAQs.md

@@ -23,19 +23,11 @@ Since HTML Inspector runs after the browser has parsed the raw markup, it cannot
 
 The downside of doing that, however, is that the raw markup will not contain any DOM modifications done after the page loads nor will it contain any markup generated by client side templates. It will also not be able to honor any of the custom config options passed to HTML Inspector like `exclude` and `excludeSubTree`.
 
-<<<<<<< HEAD
 #### HTML Inspector warns me about using classes not found in any stylesheet, but those classes *are* in my stylesheets. What's going on?
 
 HTML Inspector creates its list of classes by looping through the `document.styleSheets` object. For most situations this works just fine, but if you have stylesheets loaded from a different domain, or you're using the `file:` protocol, most browsers report those stylesheets as empty.
 
 Unfortunately, there's no easy way around this. Your options are to either only use stylesheets on the same domain, whitelist the offending classes, or exclude the `unused-classes` rule.
-=======
-#### Why does HTML Inspector warn me about unused classes when those classes *are* found in my stylesheets?
-
-HTML Inspector creates its list of classes by looping through the `document.styleSheets` object. For most situations this works just fine, but if you have stylesheets loaded from a different domain, or you're using the `file:` protocol, most browsers report those stylesheets as empty.
-
-Unfortunately, there's no easy way around this. Your options are to either only use stylesheets on the same domain, whitelist the offending classes, or simply not use the `unused-classes` rule.
->>>>>>> 689a1b44c795dda09711cd20ffd61b23ff481190
 
 #### How can I get HTML Inspector to stop warning me about unused Modernizr classes?