fix rebase conflict

getsentry · Sep 18, 2024 · eb62e10 · eb62e10
1 parent 244490c
commit eb62e10
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/packages/sveltekit/src/server/handle.ts b/packages/sveltekit/src/server/handle.ts
@@ -5,21 +5,14 @@ import {
   getCurrentScope,
   getDefaultIsolationScope,
   getIsolationScope,
-<<<<<<< HEAD
   getTraceMetaTags,
-=======
->>>>>>> af5d32206 (cleanup)
   setHttpStatus,
   withIsolationScope,
 } from '@sentry/core';
 import { startSpan } from '@sentry/core';
 import { continueTrace } from '@sentry/node';
 import type { Span } from '@sentry/types';
-<<<<<<< HEAD
 import { logger, winterCGRequestToRequestData } from '@sentry/utils';
-=======
-import { logger, objectify, winterCGRequestToRequestData } from '@sentry/utils';
->>>>>>> af5d32206 (cleanup)
 import type { Handle, ResolveOptions } from '@sveltejs/kit';
 
 import { DEBUG_BUILD } from '../common/debug-build';