workers; hixie: fix conflict issue

workers; hixie: fix conflict issue

http://dev.w3.org/cvsweb/html5/workers/Overview.html?r1=1.278&r2=1.279&f=h

===================================================================
RCS file: /sources/public/html5/workers/Overview.html,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -d -r1.278 -r1.279
--- Overview.html 14 Mar 2011 10:20:09 -0000 1.278
+++ Overview.html 8 Apr 2011 19:20:47 -0000 1.279
@@ -230,15 +230,17 @@
 
    <h1>Web Workers</h1>
    <!--<h2 class="no-num no-toc">(subtitle)</h2>-->
-   <h2 class="no-num no-toc" id="editor-s-draft-14-march-2011">Editor's Draft 14 March 2011</h2>
+   <h2 class="no-num no-toc" id="editor-s-draft-8-april-2011">Editor's Draft 8 April 2011</h2>
    <dl><dt>Latest Published Version:</dt>
     <dd><a href="http://www.w3.org/TR/workers/">http://www.w3.org/TR/workers/</a></dd>
     <dt>Latest Editor's Draft:</dt>
     <dd><a class="latest-link" href="http://dev.w3.org/html5/workers/">http://dev.w3.org/html5/workers/</a></dd>
 <!-- ZZZ: add the new version after it has shipped-->
     <dt>Previous Versions:</dt>
-    <dd><a href="http://www.w3.org/TR/2009/WD-workers-20090423/">http://www.w3.org/TR/2009/WD-workers-20090423/</a>
+    <dd><a href="http://www.w3.org/TR/2011/WD-workers-20110310/">http://www.w3.org/TR/2011/WD-workers-20110310/</a></dd>
+    <dd><a href="http://www.w3.org/TR/2011/WD-workers-20110208/">http://www.w3.org/TR/2011/WD-workers-20110208/</a></dd>
     <dd><a href="http://www.w3.org/TR/2009/WD-workers-20091029/">http://www.w3.org/TR/2009/WD-workers-20091029/</a></dd>
+    <dd><a href="http://www.w3.org/TR/2009/WD-workers-20090423/">http://www.w3.org/TR/2009/WD-workers-20090423/</a></dd>
 <!-- :ZZZ -->
     <dt>Editor:</dt>
     <dd><a href="mailto:ian@hixie.ch">Ian Hickson</a>, Google, Inc.</dd>
@@ -332,7 +334,7 @@
   </dl><p>The W3C <a href="http://www.w3.org/2008/webapps/">Web Applications
   Working Group</a> is the W3C working group responsible for this
   specification's progress along the W3C Recommendation track.
-  This specification is the 14 March 2011 Editor's Draft.
+  This specification is the 8 April 2011 Editor's Draft.
   </p><!-- required patent boilerplate --><p>This document was produced by a group operating under the <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5
   February 2004 W3C Patent Policy</a>. W3C maintains a <a href="http://www.w3.org/2004/01/pp-impl/42538/status" rel="disclosure">public list of
   any patent disclosures</a> made in connection with the deliverables

Received on Friday, 8 April 2011 19:29:58 UTC