Skip to content

chore(docs): Fix unresolved rebase conflict in Migration.MD - #5076

Merged
Lms24 merged 1 commit into
7.xfrom
lms-fix-migration-conflict
May 11, 2022
Merged

chore(docs): Fix unresolved rebase conflict in Migration.MD#5076
Lms24 merged 1 commit into
7.xfrom
lms-fix-migration-conflict

Conversation

@Lms24

Copy link
Copy Markdown
Member

This PR is a follow up of #5054 which left an unresolved conflict in Migration.MD that emerged while rebasing the PR onto the current 7.x branch.

@Lms24
Lms24 requested review from AbhiPrasad and lforstMay 11, 2022 13:30
@github-actions

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize
@sentry/browser - ES5 CDN Bundle (gzipped + minified)18.78 KB (-6.77% 🔽)
@sentry/browser - ES5 CDN Bundle (minified)58.38 KB (-9.65% 🔽)
@sentry/browser - ES6 CDN Bundle (gzipped + minified)17.54 KB (-6.99% 🔽)
@sentry/browser - ES6 CDN Bundle (minified)52.61 KB (-9.26% 🔽)
@sentry/browser - Webpack (gzipped + minified)19.33 KB (-16.83% 🔽)
@sentry/browser - Webpack (minified)61.47 KB (-24.77% 🔽)
@sentry/react - Webpack (gzipped + minified)19.35 KB (-16.87% 🔽)
@sentry/nextjs Client - Webpack (gzipped + minified)42.81 KB (-10.91% 🔽)
@sentry/browser + @sentry/tracing - ES5 CDN Bundle (gzipped + minified)24.43 KB (-6.3% 🔽)
@sentry/browser + @sentry/tracing - ES6 CDN Bundle (gzipped + minified)23 KB (-6.05% 🔽)

@Lms24
Lms24 merged commit 6536eb6 into 7.xMay 11, 2022
@Lms24
Lms24 deleted the lms-fix-migration-conflict branch May 11, 2022 13:49
@AbhiPrasadAbhiPrasad added this to the 7.0.0 milestone May 12, 2022
AbhiPrasad pushed a commit that referenced this pull request May 30, 2022
fix after merging #5054 which left an unresolved conflict in Migration.MD that emerged while rebasing the PR onto the current 7.x branch.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@Lms24@AbhiPrasad