[editorial] remove unresolved merge clashes

Author: nigelmegitt

index.html

@@ -2980,13 +2980,8 @@ <h3>Validation warnings and errors</h3>
       <h3>Conformance of <a>DAPT Documents</a></h3>
       <p>Conformant <a>DAPT Documents</a> are [[TTML2]] <a>timed text content document instances</a> that
         conform to the normative provisions of this specification.
-<<<<<<< Updated upstream
-        Those provisions are expressed using the 
-        <a data-cite="TTML2#profile">profile</a> vocabulary of [[TTML2]] in the
-=======
         Those provisions are expressed using the
-        <a href="https://www.w3.org/TR/ttml2/#profile">profile</a> vocabulary of [[TTML2]] in the
->>>>>>> Stashed changes
+        <a data-cite="TTML2#profile">profile</a> vocabulary of [[TTML2]] in the
         <dfn data-cite="ttml2#terms-content-profile">content profile</dfn> defined
         in <a href="#profiles"></a>.</p>
       <p class="note">
@@ -3001,13 +2996,8 @@ <h3>Conformance of DAPT Processors</h3>
       <p>Conformant DAPT Processors are [[TTML2]]
         <dfn data-cite="TTML2#terms-content-processor">content processors</dfn> that
         conform to the normative provisions of this specification.
-<<<<<<< Updated upstream
-        Those provisions are expressed using the 
-        <a data-cite="TTML2#profile">profile</a> vocabulary of [[TTML2]] in the
-=======
         Those provisions are expressed using the
-        <a href="https://www.w3.org/TR/ttml2/#profile">profile</a> vocabulary of [[TTML2]] in the
->>>>>>> Stashed changes
+        <a data-cite="TTML2#profile">profile</a> vocabulary of [[TTML2]] in the
         <dfn data-cite="TTML2#terms-processor-profile">processor profile</dfn> defined
         in <a href="#profiles"></a>.</p>
         <aside class="note">The provisions in this specification are expressed in terms of [[TTML2]] <a>content processor</a> types,
@@ -4247,13 +4237,8 @@ <h3 id="extension-source-data">#source-data</h3>
           it recognizes and is capable of transforming values of the
           <a data-cite="TTML2#embedded-content-vocabulary-source">&lt;source&gt;</a> element
           child of a
-<<<<<<< Updated upstream
           <a data-cite="TTML2#embedded-content-vocabulary-data">&lt;data&gt;</a> element.</p>
-  
-=======
-          <a href="https://www.w3.org/TR/ttml2/#embedded-content-vocabulary-data">&lt;data&gt;</a> element.</p>
 
->>>>>>> Stashed changes
         <p>A <a>presentation processor</a> supports the <code>#source-data</code> extension if
           it implements presentation semantic support of the
           <a data-cite="TTML2#embedded-content-vocabulary-source">&lt;source&gt;</a> element