Merge pull request #1227 from JKRhb/fix-merge-conflict

Remove left over merge conflict seperators
w3c · Sep 15, 2021 · 37a0a29 · 37a0a29
2 parents d6410c9 + 402dd66
commit 37a0a29
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/index.html b/index.html
@@ -4404,8 +4404,7 @@ <h2>Canonicalization</h2>
   representing the UTC time zone instead 
   of an offset.</span>
   </li>
-<<<<<<< HEAD
-=======
+
   <li><span class="rfc2119-assertion" id="canonical-datetime-fracsec">
   In the <a>Canonical TD</a>, 
   values that are of type <code>dateTime</code>
@@ -4418,7 +4417,7 @@ <h2>Canonicalization</h2>
   values that are of type <code>dateTime</code>
   MUST NOT use '24' in the hours field.</span>
   </li>
->>>>>>> upstream/main
+
   <li><span class="rfc2119-assertion" id="canonical-defaults">
   In the <a>Canonical TD</a>,
   all required elements MUST be given explicitly, even if they have defaults

diff --git a/index.template.html b/index.template.html
@@ -3379,8 +3379,7 @@ <h2>Canonicalization</h2>
   representing the UTC time zone instead 
   of an offset.</span>
   </li>
-<<<<<<< HEAD
-=======
+
   <li><span class="rfc2119-assertion" id="canonical-datetime-fracsec">
   In the <a>Canonical TD</a>, 
   values that are of type <code>dateTime</code>
@@ -3393,7 +3392,7 @@ <h2>Canonicalization</h2>
   values that are of type <code>dateTime</code>
   MUST NOT use '24' in the hours field.</span>
   </li>
->>>>>>> upstream/main
+
   <li><span class="rfc2119-assertion" id="canonical-defaults">
   In the <a>Canonical TD</a>,
   all required elements MUST be given explicitly, even if they have defaults