Fix annotate_mode.mu loading error caused by bad merge #1022
Conversation
This file contains hidden or 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
Signed-off-by: Bernard Laberge <[email protected]>
bernie-laberge
requested review from
cedrik-fuoco-adsk and
eloisebrosseau
as code owners
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Fix annotate_mode.mu loading error caused by bad merge
Linked issues
NA
Describe the reason for the change.
A bad automatic merge occurred for the annotate_mode.mu resulting in an error at load time.
Summarize your change.
Fixed the bad merge
Describe what you have tested and on which operating system.
Successfully tested on macOS
Add a list of changes, and note any that might need special attention during the review.
If possible, provide screenshots.