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

Update. #119

Merged
merged 14 commits into from
Oct 27, 2024
Merged

Update. #119

merged 14 commits into from
Oct 27, 2024

Conversation

Merrokitsune
Copy link
Collaborator

Apparently, previous update attempt failed.

@github-actions github-actions bot added the S: Merge Conflict Status: Merge conflicts need to be resolved. label Oct 27, 2024
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added Changes: Map Changes: Might require knowledge of mapping. Changes: UI Changes: Might require knowledge of user interfaces. labels Oct 27, 2024
@github-actions github-actions bot removed the S: Merge Conflict Status: Merge conflicts need to be resolved. label Oct 27, 2024
@GitHubUser53123 GitHubUser53123 merged commit 1932c07 into master Oct 27, 2024
11 checks passed
@GitHubUser53123 GitHubUser53123 deleted the alt2 branch October 27, 2024 07:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Map Changes: Might require knowledge of mapping. Changes: UI Changes: Might require knowledge of user interfaces.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants