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 some typos #472

Merged
merged 1 commit into from
Jun 26, 2023
Merged

fix some typos #472

merged 1 commit into from
Jun 26, 2023

Conversation

striezel
Copy link
Contributor

This pull request fixes some typos, no functional changes intended.

@Try
Copy link
Owner

Try commented Jun 26, 2023

Hi, @striezel and thanks for PR!

Path, looks good, can merge after resolving conflict in game/resources.cpp

@striezel
Copy link
Contributor Author

@Try

Path, looks good, can merge after resolving conflict in game/resources.cpp

The force push to the master branch caused the conflict. You should not really force push to the most important branch of a repo, especially when other people have already based their work on it.

However, I've resolved the conflict, so this can now be merged cleanly.

@Try Try merged commit 56c8dcc into Try:master Jun 26, 2023
@Try
Copy link
Owner

Try commented Jun 26, 2023

However, I've resolved the conflict, so this can now be merged cleanly.

Yeah, sorry for that. Merged now!

@striezel striezel deleted the fix-typos branch June 26, 2023 17:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Nindaleth Nindaleth Nindaleth left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@striezel @Try @Nindaleth