From 402dd66999d8d83b9a71378fe3f358d14738a257 Mon Sep 17 00:00:00 2001
From: Jan Romann <jan.romann@uni-bremen.de>
Date: Wed, 15 Sep 2021 12:52:59 +0200
Subject: [PATCH] Remove left over merge conflict seperators

---
 index.html          | 5 ++---
 index.template.html | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/index.html b/index.html
index 95b7f9dcd..5bc847663 100644
--- a/index.html
+++ b/index.html
@@ -4400,8 +4400,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>
@@ -4414,7 +4413,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
index f6297f844..c79884515 100644
--- 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