Skip to content

Commit 6536eb6

Browse files
authored
chore(docs): Fix unresolved rebase conflict in Migration.MD (#5076)
fix after merging #5054 which left an unresolved conflict in Migration.MD that emerged while rebasing the PR onto the current 7.x branch.
1 parent 7bf6540 commit 6536eb6

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

MIGRATION.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -339,11 +339,7 @@ For our efforts to reduce bundle size of the SDK we had to remove and refactor p
339339
- Rename `UserAgent` integration to `HttpContext`. (see [#5027](https://github.com/getsentry/sentry-javascript/pull/5027))
340340
- Remove `SDK_NAME` export from `@sentry/browser`, `@sentry/node`, `@sentry/tracing` and `@sentry/vue` packages.
341341
- Removed `eventStatusFromHttpCode` to save on bundle size.
342-
<<<<<<< HEAD
343342
- Replace `BrowserTracing` `maxTransactionDuration` option with `finalTimeout` option
344-
- Replace `Session` class with a session object and functions (see [#5054](https://github.com/getsentry/sentry-javascript/pull/5054)).
345-
=======
346-
>>>>>>> 5c81e32c4 (Add "Session Changes" section to Migration docs)
347343

348344
## Sentry Angular SDK Changes
349345

0 commit comments

Comments
 (0)