Skip to content

Commit 430ca03

Browse files
committed
fix rebase conflict
1 parent aef7507 commit 430ca03

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

packages/sveltekit/src/server/handle.ts

-7
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,14 @@ import {
55
getCurrentScope,
66
getDefaultIsolationScope,
77
getIsolationScope,
8-
<<<<<<< HEAD
98
getTraceMetaTags,
10-
=======
11-
>>>>>>> af5d32206 (cleanup)
129
setHttpStatus,
1310
withIsolationScope,
1411
} from '@sentry/core';
1512
import { startSpan } from '@sentry/core';
1613
import { continueTrace } from '@sentry/node';
1714
import type { Span } from '@sentry/types';
18-
<<<<<<< HEAD
1915
import { logger, winterCGRequestToRequestData } from '@sentry/utils';
20-
=======
21-
import { logger, objectify, winterCGRequestToRequestData } from '@sentry/utils';
22-
>>>>>>> af5d32206 (cleanup)
2316
import type { Handle, ResolveOptions } from '@sveltejs/kit';
2417

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

0 commit comments

Comments
 (0)