Skip to content

Commit

Permalink
Merge branch 'refs/heads/main' into dc_slack_distribution_failure_beh…
Browse files Browse the repository at this point in the history
…avior_fail

# Conflicts:
#	src/main/java/com/powsybl/openloadflow/ac/outerloop/DistributedSlackOuterLoop.java
#	src/main/java/com/powsybl/openloadflow/network/util/ActivePowerDistribution.java
  • Loading branch information
jeandemanged committed Dec 12, 2024
2 parents 2025650 + 39ca741 commit 9dec4c9
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 9dec4c9

Please sign in to comment.