resolved auto-merge conflicts

w3c · Nov 9, 2017 · 75d7551 · 75d7551
2 parents 38d04c7 + 0e93926
commit 75d7551
Show file tree

Hide file tree

Showing 100 changed files with 27,337 additions and 13,385 deletions.
diff --git a/.bikeshed-include/header.include b/.bikeshed-include/header.include
@@ -21,7 +21,6 @@
   <hr title="Separator for header">
 </div>
 
-<h2 class="no-num no-toc no-ref" id="abstract">Abstract</h2>
 <div class="p-summary" data-fill-with="abstract"></div>
 
 <h2 class="no-num no-toc no-ref" id="status">Status of this document</h2>

diff --git a/.bikeshed-include/status-ED.include b/.bikeshed-include/status-ED.include
@@ -37,7 +37,7 @@
   </p>
   <p>
     This document is governed by the
-        <a id="w3c_process_revision" href="https://www.w3.org/2017/Process-20170301/">1 March 2017
+    <a id="w3c_process_revision" href="https://www.w3.org/2015/Process-20150901/">1 September 2015
     <abbr title="World Wide Web Consortium">W3C</abbr> Process Document</a>.
   </p>
 

diff --git a/.bikeshed-include/status-WD.include b/.bikeshed-include/status-WD.include
@@ -37,7 +37,7 @@
   </p>
   <p>
     This document is governed by the
-    <a id="w3c_process_revision" href="https://www.w3.org/2017/Process-20170301/">1 March 2017
+    <a id="w3c_process_revision" href="https://www.w3.org/2015/Process-20150901/">1 September 2015
     <abbr title="World Wide Web Consortium">W3C</abbr> Process Document</a>.
   </p>
 

diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
-bikeshed/
+/bikeshed/
+.vagrant/
 index.html