Amendment for #4140: Fix merge conflict #4146
Merged
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
This reverts commit a963d5b.
# Conflicts: # Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_NoLoad.mo
beutlich
added
the
V: 4.1.0-dev
beutlich
added
L: Electrical.Machines
TManikantan
approved these changes
Jun 3, 2023
arunkumar-narasimhan
approved these changes
Jun 8, 2023
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
I reverted a963d5b, cherry-picked all commits of #4107 from maint/4.0.x and resolved the one conflict properly. Finally, the overall diff is exactly the line as mentioned by @perost in #4140 (comment).
(Commits will get squashed when merged.)