cleaned up the merge markers
authorMark Sadecki <mark@w3.org>
Mon, 03 Mar 2014 16:33:18 -0500
changeset 13 056c065b1abb
parent 12 2b4b49c893c5
child 14 ccd74094c27a
cleaned up the merge markers
longdesc/exitCrit.html
--- a/longdesc/exitCrit.html	Fri Feb 28 17:26:00 2014 +0100
+++ b/longdesc/exitCrit.html	Mon Mar 03 16:33:18 2014 -0500
@@ -1,13 +1,9 @@
 <html>
   <head>
-<<<<<<< local
     <meta content="text/html; charset=UTF-8" http-equiv="content-type">
-    <style>em.rfc2119 { 
-=======
     <meta charset="UTF-8">
     <link rel="stylesheet" title="base CSS" href="http://www.w3.org/StyleSheets/TR/base.css">
     <style>em.rfc2119 {
->>>>>>> other
     text-transform:     lowercase;
     font-variant:       small-caps;
     font-style:         normal;
@@ -24,7 +20,6 @@
 
     <h1>HTML Image Description Extension (longdesc)</h1>
     <h2>Exit Criteria for Candidate Recommendation</h2>
-<<<<<<< local
     <p>Preconditions:</p>
     <ul>
       <li>There is a <a href="@@">test suite</a>. </li>
@@ -34,7 +29,6 @@
         whether an implementation that passes the "required" test also passes
         the relevant dependent tests. </li>
     </ul>
-=======
 
     <p><em>
       The following DRAFT is under consideration by the HTML Accessibility
@@ -59,9 +53,7 @@
       the following conditions are to be met:
     </p>
 
->>>>>>> other
     <ol>
-<<<<<<< local
       <li>At least two independent "release" implementations of a user agent
         pass each "required" test.</li>
       <li>At least two independent "release" implementations of an authoring
@@ -72,7 +64,9 @@
         dependent tests.</li>
       <li>At least 50 pages on the Web which are not developed as examples
         implement each content requirement.</li>
-=======
+    </ol>
+
+    <ol>
       <li>For each test in the test suite that is for a
         <a href="http://www.w3.org/TR/2005/REC-qaframe-spec-20050817/#normative-def">
           normative</a> feature, there exist atleast two independent
@@ -90,7 +84,6 @@
       <li>For each requirement on authors in the specification there exist at
         least 50 pages on the Web that implement this, and which are not
         developed as examples.</li>
->>>>>>> other
     </ol>
   </body>
 </html>