Fix leftover merge conflict marker

Author: marijnh

html/index.html

@@ -111,14 +111,8 @@ <h3>(Part 3: Node)</h3>
 
   <p>A paper version of Eloquent JavaScript, including an additional
   chapter, is being brought out
-<<<<<<< HEAD
-  by <a href="https://www.nostarch.com/ejs3">No Starch Press</a>. The
-  third edition should become available on paper somewhere in
-  2018.</p>
-=======
   by <a href="http://www.nostarch.com/ejs3">No Starch Press</a>. The
   third edition should become <a href="http://a-fwd.com/com=marijhaver-20&asin-com=1593279507">available</a> in December 2018.</p>
->>>>>>> Push forward release date to December
 
   <h2>Other pages</h2>