From 445183001b3fd5053b4c250bbcc189a81ef27377 Mon Sep 17 00:00:00 2001
From: Pierre Tachoire <pierre@lightpanda.io>
Date: Tue, 17 Feb 2026 18:27:54 +0100
Subject: [PATCH] remove merge marker from test file

---
 src/browser/tests/performance_observer/performance_observer.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/browser/tests/performance_observer/performance_observer.html b/src/browser/tests/performance_observer/performance_observer.html
index 7b5b6c9e..c1c546b7 100644
--- 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">
 {