Skip to content

Commit

Permalink
Amendment for modelica#4140: Fix merge conflict (modelica#4146)
Browse files Browse the repository at this point in the history
  • Loading branch information
beutlich authored Jun 8, 2023
1 parent 17ec1eb commit 182301b
Showing 1 changed file with 1 addition and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ equation
annotation (Line(points={{0,20},{0,12}}, color={0,0,255}));
connect(potentialSensor.phi, toSpacePhasor.u) annotation (Line(points={{0,
41},{0,50},{8,50}}, color={0,0,127}));
connect(constantSpeed.flange, smpm.flange)
annotation (Line(points={{32,0},{10,0}}));
connect(speed.flange, smpm.flange) annotation (Line(points={{30,0},{10,0}}));
connect(smpm.flange, hallSensor.flange)
annotation (Line(points={{10,0},{20,0},{20,-30},{30,-30}}));
connect(toSpacePhasor.y, toPolar.u)
Expand Down

0 comments on commit 182301b

Please sign in to comment.