From 575ae64e55c7782f178d891b76611ab5ea1b519e Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Wed, 11 May 2022 15:25:33 +0200 Subject: [PATCH] chore(docs): Fix unresolved rebase conflict in Migration.MD --- MIGRATION.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/MIGRATION.md b/MIGRATION.md index 9a27dd6f3f26..01addf214ef4 100644 --- a/MIGRATION.md +++ b/MIGRATION.md @@ -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