Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Solve Merge Conflicts for #4939 #4987

Merged
merged 12 commits into from
Apr 28, 2022
Merged

Conversation

spacesailor24
Copy link
Contributor

Fixes package-lock.json merge conflicts in #4939

@spacesailor24 spacesailor24 added the 1.x 1.0 related issues label Apr 28, 2022
@spacesailor24 spacesailor24 self-assigned this Apr 28, 2022
@render
Copy link

render bot commented Apr 28, 2022

@spacesailor24 spacesailor24 changed the title Wyatt/1.x/fix build command Solve Merge Conflicts for #4939 Apr 28, 2022
@spacesailor24 spacesailor24 mentioned this pull request Apr 28, 2022
@spacesailor24 spacesailor24 merged commit 69c0b1a into 1.x Apr 28, 2022
@spacesailor24 spacesailor24 deleted the wyatt/1.x/fix-build-command branch April 28, 2022 02:03
@jdevcs
Copy link
Contributor

jdevcs commented Apr 28, 2022

@spacesailor24 changelog in this PR still needs update under next version

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.x 1.0 related issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants