这是indexloc提供的服务,不要输入任何密码
Skip to content

Conversation

@Ash-codes18
Copy link
Contributor

Summary

Type of change

  • Bug fix (added a non-breaking change which fixes an issue)
  • New feature (added a non-breaking change which adds functionality)
  • Updated documentation (updated the readme, templates, or other repo files)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

How Has This Been Tested?

  • Ran tests with composer test
  • Added or updated test cases to test new features

@DenverCoder1
Copy link
Owner

Looks great. Merge conflicts need to be resolved by removing the conflict markers and keeping both usernames. I can do it next time I'm at a computer or you can if you'd like.

@Ash-codes18
Copy link
Contributor Author

Looks great. Merge conflicts need to be resolved by removing the conflict markers and keeping both usernames. I can do it next time I'm at a computer or you can if you'd like.

Thanks. I have resolved the conflicts.

Copy link
Owner

@DenverCoder1 DenverCoder1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@DenverCoder1 DenverCoder1 merged commit 46ca528 into DenverCoder1:main Jan 1, 2023
Sign up for free to 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