Remove stray <<< HEAD (#270)

w3c · Apr 15, 2021 · 691955b · 691955b
1 parent 72ff2a0
commit 691955b
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/index.html b/index.html
@@ -752,7 +752,6 @@ <h2>Creating a resource timing entry</h2>
 <a data-cite="PERFORMANCE-TIMELINE-2#dfn-performance-entry-buffer">performance
 entry buffer</a>.</li>
 </ol>
-<<<<<<< HEAD
 <p>To <dfn data-export="">setup the resource timing entry</dfn> for <a>PerformanceResourceTiming</a> |entry|
 given DOMString |initiatorType|, DOMString |requestedURL|, [=/fetch timing info=] |timingInfo|, and
 a DOMString |cacheMode|, perform the following steps:</p>