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

Fix for conflict of PRs #1060 and #1063 #1065

Merged
merged 1 commit into from
Aug 17, 2021
Merged

Fix for conflict of PRs #1060 and #1063 #1065

merged 1 commit into from
Aug 17, 2021

Conversation

psolstice
Copy link
Contributor

PR intention

Fix for compilation issue caused by conflict of two PRs

@reubenyap reubenyap merged commit b2eba12 into master Aug 17, 2021
@reubenyap reubenyap deleted the pr-conflict-fix branch August 17, 2021 18:06
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.

3 participants