From 9f368ac9e675092a9ab22182cacb62cad2da4c25 Mon Sep 17 00:00:00 2001
From: Vignesh Natarajan <vigneshnatarajan92@gmail.com>
Date: Sat, 14 Feb 2026 17:44:24 -0800
Subject: [PATCH] fix: media allowlist finalize (#16697) (thanks @tyler6204)

---
 src/web/media.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/web/media.ts b/src/web/media.ts
index 18a8542cab8..95887cbb0b0 100644
--- a/src/web/media.ts
+++ b/src/web/media.ts
@@ -32,7 +32,6 @@ type WebMediaOptions = {
   readFile?: (filePath: string) => Promise<Buffer>;
 };
 
-<<<<<<< HEAD
 export function getDefaultLocalRoots(): string[] {
   return [
     os.tmpdir(),