vscode failed me

withastro · Aug 16, 2024 · 0005001 · 0005001
1 parent a292a30
commit 0005001
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/packages/integrations/mdx/src/server.ts b/packages/integrations/mdx/src/server.ts
@@ -1,14 +1,7 @@
-<<<<<<< HEAD:packages/integrations/mdx/src/server.ts
 import type { NamedSSRLoadedRendererValue } from 'astro';
 import { AstroError } from 'astro/errors';
 import { AstroJSX, jsx } from 'astro/jsx-runtime';
 import { renderJSX } from 'astro/runtime/server/index.js';
-=======
-import { AstroError, AstroUserError } from '../core/errors/errors.js';
-import { AstroJSX, jsx } from '../jsx-runtime/index.js';
-import { renderJSX } from '../runtime/server/jsx.js';
-import type { NamedSSRLoadedRendererValue } from '../types/public/internal.js';
->>>>>>> next:packages/astro/src/jsx/server.ts
 
 const slotName = (str: string) => str.trim().replace(/[-_]([a-z])/g, (_, w) => w.toUpperCase());