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

Added vec2type struct and unitstype enum; changed IconStyle hot_spot #13

Merged
merged 5 commits into from
Dec 8, 2021

Conversation

ardouglas
Copy link
Contributor

from tuple to Vec2.

@pjsier
Copy link
Member

pjsier commented Dec 5, 2021

Thanks for opening the PR! I added a requirement in CI for linting and formatting, could you rebase off of main and resolve the issues there?

@ardouglas
Copy link
Contributor Author

Absolutely! Thanks!

@ardouglas
Copy link
Contributor Author

I'm assuming the merge commit above was something you were trying to avoid when you mentioned rebasing? If so I'll try to fix that.

@pjsier
Copy link
Member

pjsier commented Dec 7, 2021

Thanks for making those updates! It looks like there are still some failing format issues. And don't worry about the merge commit, I'll do a squash merge that will remove it when this is ready

Copy link
Member

@pjsier pjsier left a comment

Choose a reason for hiding this comment

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

Thanks for those updates! Sorry I missed these on an initial pass

@pjsier
Copy link
Member

pjsier commented Dec 8, 2021

Thanks so much for these updates! I'll squash merge this now and add you to the changelog

@pjsier pjsier merged commit a989c29 into georust:main Dec 8, 2021
@pjsier pjsier mentioned this pull request Dec 8, 2021
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