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

fix: 2.x fix conflicts #458

Merged
merged 4 commits into from
Apr 7, 2020
Merged

fix: 2.x fix conflicts #458

merged 4 commits into from
Apr 7, 2020

Conversation

kurten
Copy link
Contributor

@kurten kurten commented Apr 7, 2020

  • 添加判断 class 是否被 provide 判断逻辑

@czy88840616 czy88840616 changed the title 2.x fix conflicts fix: 2.x fix conflicts Apr 7, 2020
@czy88840616 czy88840616 merged commit 2b0f44c into 2.x Apr 7, 2020
@czy88840616 czy88840616 deleted the 2.x_fix_conflicts branch April 7, 2020 07:21
@czy88840616 czy88840616 restored the 2.x_fix_conflicts branch April 7, 2020 07:25
@czy88840616 czy88840616 deleted the 2.x_fix_conflicts branch April 7, 2020 07:27
@czy88840616 czy88840616 restored the 2.x_fix_conflicts branch April 7, 2020 07:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@czy88840616 czy88840616 czy88840616 approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@kurten @czy88840616