From 91c2d93923310bc196e86c8e1524aaa9bd760e84 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Thu, 26 Feb 2026 15:19:47 -0500
Subject: [PATCH] oops

---
 packages/svelte/src/internal/client/dom/blocks/boundary.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/svelte/src/internal/client/dom/blocks/boundary.js b/packages/svelte/src/internal/client/dom/blocks/boundary.js
index 641b7953ee..3879fc19e0 100644
--- a/packages/svelte/src/internal/client/dom/blocks/boundary.js
+++ b/packages/svelte/src/internal/client/dom/blocks/boundary.js
@@ -1,12 +1,8 @@
 /** @import { Effect, Source, TemplateNode, } from '#client' */
 import {
 	BOUNDARY_EFFECT,
-<<<<<<< HEAD
 	BRANCH_EFFECT,
 	CLEAN,
-	COMMENT_NODE,
-=======
->>>>>>> main
 	DIRTY,
 	EFFECT_PRESERVED,
 	EFFECT_TRANSPARENT,