Skip to content

Commit 3f8ca67

Browse files
committed
fix merge conflict
1 parent 5760c1c commit 3f8ca67

File tree

1 file changed

+0
-17
lines changed
  • packages/node-experimental/src/sdk

1 file changed

+0
-17
lines changed

packages/node-experimental/src/sdk/api.ts

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -96,23 +96,6 @@ export function withIsolationScope<T>(callback: (isolationScope: Scope) => T): T
9696
});
9797
}
9898

99-
/**
100-
<<<<<<< HEAD
101-
* Configure the current scope.
102-
* @deprecated Use `getCurrentScope()` instead.
103-
*/
104-
export function configureScope(callback: (scope: Scope) => void): void {
105-
callback(getCurrentScope());
106-
=======
107-
* Get the ID of the last sent error event.
108-
* @deprecated This function will be removed in the next major version of the Sentry SDK.
109-
*/
110-
export function lastEventId(): string | undefined {
111-
// eslint-disable-next-line deprecation/deprecation
112-
return getCurrentScope().lastEventId();
113-
>>>>>>> 63597e2af (feat(v8): Remove deprecated configureScope call)
114-
}
115-
11699
/** Record an exception and send it to Sentry. */
117100
export function captureException(exception: unknown, hint?: ExclusiveEventHintOrCaptureContext): string {
118101
return getCurrentScope().captureException(exception, parseEventHintOrCaptureContext(hint));

0 commit comments

Comments
 (0)