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

Patch 7 #469

Merged
merged 10 commits into from Aug 30, 2022
Merged

Patch 7 #469

merged 10 commits into from Aug 30, 2022

Conversation

TheRealJohnMac50
Copy link
Contributor

Please merge these changes to #458 thank you.

@edakturk14
Copy link
Contributor

hey @TheRealJohnMac50, the branch has conflicts and I am unable to merge the changes. As the PR author want to check with you and see if you could resolve the conflicts. It could be helpful to close this PR and make a new one on the base branch. Let me know if you have any questions. Thanks!

@TheRealJohnMac50
Copy link
Contributor Author

hey @TheRealJohnMac50, the branch has conflicts and I am unable to merge the changes. As the PR author want to check with you and see if you could resolve the conflicts. It could be helpful to close this PR and make a new one on the base branch. Let me know if you have any questions. Thanks!

I've resolved all conflicts.

@edakturk14 edakturk14 merged commit f7415ba into helium:main Aug 30, 2022
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.

None yet

3 participants