Push forward release date to December

(This should be the last delay, really, it's already being
printed...)

Author: marijnh

html/index.html

@@ -26,7 +26,7 @@ <h1>Eloquent JavaScript<div style="font-size: 70%">3rd edition</div></h2>
   <p>This is a book about JavaScript, programming, and the wonders of
   the digital. You can read it online here, or get your own
   <a href="https://www.amazon.com/gp/product/1593275846/ref=as_li_qf_sp_asin_il_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1593275846&linkCode=as2&tag=marijhaver-20&linkId=VPXXXSRYC5COG5R5">paperback
-  copy</a> of the <em>second</em> edition. A paper third edition is expected to be <a href="http://a-fwd.com/com=marijhaver-20&asin-com=1593279507">available</a> this November.</p>
+  copy</a> of the <em>second</em> edition. A paper third edition is expected to be <a href="http://a-fwd.com/com=marijhaver-20&asin-com=1593279507">available</a> this December.</p>
 
   <p style="text-align: center; margin: 2em 0">
     <a href="http://a-fwd.com/com=marijhaver-20&asin-com=1593279507">
@@ -111,9 +111,14 @@ <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>