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

Pret merge (14th of August) #5165

Merged
merged 2 commits into from
Aug 14, 2024

Conversation

Bassoonian
Copy link
Collaborator

This is a pret merge - DO NOT SQUASH!

Description

No merge conflicts.

checksum

Before

5e5cde9220ed708b418f9f428c920fe0bd5d0ea7

After

cbcd1790a3967e70e40516e683e7d893895a511a

Almost undoubtedly the result of modern dealing with the rewritten block of code in item_use.c differently.

Discord contact info

bassoonian

@AsparagusEduardo AsparagusEduardo merged commit a00a584 into rh-hideout:master Aug 14, 2024
1 check passed
@hedara90 hedara90 added the type: sync Syncing with pret's upstream label Aug 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type: sync Syncing with pret's upstream
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants