oops

3 weeks ago · 91c2d93923
parent bb2515da57
commit 91c2d93923
1 changed files with 0 additions and 4 deletions
--- 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,