Merge pull request #1575 from lightpanda-io/remove-merge-marker

remove merge marker from test file
2026-03-21 20:24:42 +00:00 · 2026-02-17 18:29:12 +01:00
parent eba3f84c04 445183001b
commit 55a8b37ef8
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">
 {