fix: media allowlist finalize (#16697) (thanks @tyler6204)

2026-02-14 17:44:24 -08:00 · 2026-02-14 17:44:24 -08:00 · 9f368ac9e6
commit 9f368ac9e6
parent edb06170f5
1 changed files with 0 additions and 1 deletions
--- 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(),