machine-generated version

Author: howcome

css-multicol/Overview.html

@@ -11,23 +11,17 @@
    rel=dcterms.rights>
   <meta content="CSS Multi-column Layout Module" name=dcterms.title>
   <meta content=text name=dcterms.type>
-  <meta content=2013-07-22 name=dcterms.date>
+  <meta content=2013-08-05 name=dcterms.date>
   <meta content="Håkon Wium Lie" name=dcterms.creator>
   <meta content=W3C name=dcterms.publisher>
   <meta content="http://dev.w3.org/csswg/css3-multicol/"
    name=dcterms.identifier>
   <link href="../default.css" rel=stylesheet type="text/css">
   <link href="http://www.w3.org/StyleSheets/TR/W3C-ED.css" rel=stylesheet
    type="text/css">
-<<<<<<< local
-   <script defer=defer
-      src="http://test.csswg.org/harness/annotate.js#css-multicol-1_dev"
-      type="text/javascript"></script>
-=======
   <script defer=defer
-   src="http://test.csswg.org/harness/annotate.js#CSS3-MULTICOL_DEV"
+   src="http://test.csswg.org/harness/annotate.js#css-multicol-1_dev"
    type="text/javascript"></script>
->>>>>>> other
   <style type="text/css">
 .cols { width: 500px; height: 200px; background: #fff; position: relative; border: solid 5px blue; margin: 0.5em 2em 1em 0; font: bold 14px/19px Arial, sans-serif }
 .cols p { padding: 3px; margin: 0 }
@@ -48,13 +42,13 @@
 
    <h1>CSS Multi-column Layout Module</h1>
 
-   <h2 class="no-num no-toc" id=w3c-working>Editor's Draft 22 July 2013</h2>
+   <h2 class="no-num no-toc" id=w3c-working>Editor's Draft 5 August 2013</h2>
 
    <dl>
     <dt>This version:
 
     <dd>
-     <!--<a href="http://www.w3.org/TR/2013/CR-css3-multicol-20130722">http://dev.w3.org/csswg/css3-multicol/</a>-->
+     <!--<a href="http://www.w3.org/TR/2013/CR-css3-multicol-20130805">http://dev.w3.org/csswg/css3-multicol/</a>-->
      <a
      href="http://dev.w3.org/csswg/css3-multicol/">http://dev.w3.org/csswg/css3-multicol/</a>