Skip to content

Commit 1f64644

Browse files
committed
cleanup
1 parent 34a4b1f commit 1f64644

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

packages/sveltekit/src/server/handle.ts

+7
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,21 @@ import {
55
getCurrentScope,
66
getDefaultIsolationScope,
77
getIsolationScope,
8+
<<<<<<< HEAD
89
getTraceMetaTags,
10+
=======
11+
>>>>>>> af5d32206 (cleanup)
912
setHttpStatus,
1013
withIsolationScope,
1114
} from '@sentry/core';
1215
import { startSpan } from '@sentry/core';
1316
import { continueTrace } from '@sentry/node';
1417
import type { Span } from '@sentry/types';
18+
<<<<<<< HEAD
1519
import { logger, winterCGRequestToRequestData } from '@sentry/utils';
20+
=======
21+
import { logger, objectify, winterCGRequestToRequestData } from '@sentry/utils';
22+
>>>>>>> af5d32206 (cleanup)
1623
import type { Handle, ResolveOptions } from '@sveltejs/kit';
1724

1825
import { DEBUG_BUILD } from '../common/debug-build';

0 commit comments

Comments
 (0)