Fix commit glitch

Author: gregsullivan

index.html

@@ -546,11 +546,7 @@ <h2>Working with images</h2>
       <ul>
         <li><code>src</code> is the <em>attribute</em></li>
         <li><code>http://goo.gl/7eSU5</code> is the <em>value</em> of that attribute<br />
-<<<<<<< HEAD
-          <span class="sidenote">Values are typically surrounded by <em>double quotes</em> since occasionally values may contain spaces.</span></li>
-=======
           <span class="sidenote">Values are typically surrounded by <em>double quotes</em> since values may contain spaces.</span></li>
->>>>>>> Final revisions
       </ul>
       <p>With an <code>img</code> tag, the value of the <code>src</code> attribute tells the browser what the <em>source</em> of our image is.</p>
     </article>