Skip to content

Commit

Permalink
chore(docs): Fix unresolved rebase conflict in Migration.MD (#5076)
Browse files Browse the repository at this point in the history
fix after merging #5054 which left an unresolved conflict in Migration.MD that emerged while rebasing the PR onto the current 7.x branch.
  • Loading branch information
Lms24 authored and AbhiPrasad committed May 30, 2022
1 parent 7c0ce99 commit 98a7789
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions MIGRATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -339,11 +339,7 @@ For our efforts to reduce bundle size of the SDK we had to remove and refactor p
- Rename `UserAgent` integration to `HttpContext`. (see [#5027](https://github.com/getsentry/sentry-javascript/pull/5027))
- Remove `SDK_NAME` export from `@sentry/browser`, `@sentry/node`, `@sentry/tracing` and `@sentry/vue` packages.
- Removed `eventStatusFromHttpCode` to save on bundle size.
<<<<<<< HEAD
- Replace `BrowserTracing` `maxTransactionDuration` option with `finalTimeout` option
- Replace `Session` class with a session object and functions (see [#5054](https://github.com/getsentry/sentry-javascript/pull/5054)).
=======
>>>>>>> 5c81e32c4 (Add "Session Changes" section to Migration docs)

## Sentry Angular SDK Changes

Expand Down

0 comments on commit 98a7789

Please sign in to comment.