File tree Expand file tree Collapse file tree 1 file changed +0
-7
lines changed
packages/sveltekit/src/server Expand file tree Collapse file tree 1 file changed +0
-7
lines changed Original file line number Diff line number Diff line change @@ -5,21 +5,14 @@ import {
5
5
getCurrentScope ,
6
6
getDefaultIsolationScope ,
7
7
getIsolationScope ,
8
- < << << << HEAD
9
8
getTraceMetaTags ,
10
- = === ===
11
- >>> >>> > af5d32206 ( cleanup )
12
9
setHttpStatus ,
13
10
withIsolationScope ,
14
11
} from '@sentry/core' ;
15
12
import { startSpan } from '@sentry/core' ;
16
13
import { continueTrace } from '@sentry/node' ;
17
14
import type { Span } from '@sentry/types' ;
18
- < < < << << HEAD
19
15
import { logger , winterCGRequestToRequestData } from '@sentry/utils' ;
20
- === === =
21
- import { logger , objectify , winterCGRequestToRequestData } from '@sentry/utils' ;
22
- >>> >>> > af5d32206 ( cleanup )
23
16
import type { Handle , ResolveOptions } from '@sveltejs/kit' ;
24
17
25
18
import { DEBUG_BUILD } from '../common/debug-build' ;
You can’t perform that action at this time.
0 commit comments