fixed the README. damn pulls

meawwat · Apr 27, 2011 · cfd117e · cfd117e
1 parent 2db2c47
commit cfd117e
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/README.markdown b/README.markdown
@@ -12,11 +12,7 @@ for flags such as:
 +	__Missing required attributes on tags__, such as alt tags on images (lots of these)
 +	__Deprecated and Non-W3C Elements__ - see [http://www.w3.org/TR/html5/obsolete.html#obsolete] (W3C.org's article on obselete tags)
 +	__Non-W3C Attributes__ - as above, just the most important ones since there are MANY
-<<<<<<< HEAD
 
-=======
-
->>>>>>> 60694ae588410f6665ad6e1f7e9aa489dc5c08c8
 Hovering over most elements will cause a description to be displayed in the top left, or top right corner of the screen.
 
 ### Why should I use it?