Restore lost constant #73472
Merged
Restore lost constant #73472
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
Crafting / Construction / Recipes
|
I assume |
|
The reason I stumbled upon it was because I had to do a PR conflict resolution. Then the testing kicked off by that failed (I won't bother to check which one), and then I updated my local master copy and saw that it failed too. Hence this PR. |
Brambor
added a commit
to Brambor/Cataclysm-DDA
that referenced
this pull request
May 3, 2024
github-actions
bot
added
the
BasicBuildPassed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
None
Purpose of change
master didn't compile because of a missing constant, presumably due to mergers conflicting (e.g. one removing an unused constant while another used the previously unused constant).
Describe the solution
Add/Restore the constant.
Describe alternatives you've considered
Testing
Compilation only, since the error corrected is that 'master' doesn't compile.
Additional context