remove merge marker from test file

2026-03-22 04:34:44 +00:00 · 2026-02-17 18:27:54 +01:00
parent db4a97743f
commit 445183001b
1 changed files with 0 additions and 1 deletions
--- a/src/browser/tests/performance_observer/performance_observer.html
+++ b/src/browser/tests/performance_observer/performance_observer.html
@@ -37,7 +37,6 @@
 }
 </script>

-<<<<<<< HEAD
 <script id="microtask_access_to_list">
 {