Skip to content
This repository was archived by the owner on Mar 5, 2025. It is now read-only.

Solve Merge Conflicts for #4939 - #4987

Merged
Spacesai1or merged 12 commits into
1.xfrom
wyatt/1.x/fix-build-command
Apr 28, 2022
Merged

Solve Merge Conflicts for #4939#4987
Spacesai1or merged 12 commits into
1.xfrom
wyatt/1.x/fix-build-command

Conversation

@Spacesai1or

Copy link
Copy Markdown
Contributor

Fixes package-lock.json merge conflicts in #4939

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

render Bot commented Apr 28, 2022

Copy link
Copy Markdown

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

jdevcs commented Apr 28, 2022

Copy link
Copy Markdown
Contributor

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

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

1.x 1.0 related issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants