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.

Sign up for GitHub

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

Jump to bottom

refactor: resolve conflicts for dependency location #7641

Merged
merged 2 commits into from
Aug 21, 2024
Merged

refactor: resolve conflicts for dependency location #7641

merged 2 commits into from
Aug 21, 2024

Conversation

shulaoda
Copy link
Contributor

Summary

Related to #7635 and #7422

Checklist

  • Tests updated (or not required).
  • Documentation updated (or not required).

@netlify Netlify
Copy link

netlify bot commented Aug 21, 2024 •
edited
Loading

✅ Deploy Preview for rspack canceled.

Built without sensitive environment variables

Name Link
🔨 Latest commit 2cf571c
🔍 Latest deploy log https://app.netlify.com/sites/rspack/deploys/66c5be712c67110008d15319

@shulaoda shulaoda mentioned this pull request Aug 21, 2024
Open
@shulaoda
Copy link
Contributor Author

@h-a-n-a cc

@h-a-n-a h-a-n-a changed the title refactor: resolve conflict dependency location refactor: resolve conflicts for dependency location Aug 21, 2024
@h-a-n-a h-a-n-a merged commit c6accb4 into web-infra-dev:main Aug 21, 2024
30 checks passed
@shulaoda shulaoda deleted the refactor/resolve-conflict-dependency-location branch August 21, 2024 10:51
@chenjiahan chenjiahan mentioned this pull request Aug 23, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@h-a-n-a h-a-n-a h-a-n-a approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@shulaoda @h-a-n-a