Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into windturbine-docs
Browse files Browse the repository at this point in the history
# Conflicts:
#	examples/windmill/_api/blade.py
#	examples/windmill/_api/gearbox.py
#	examples/windmill/_api/generator.py
#	examples/windmill/_api/high_speed_shaft.py
#	examples/windmill/_api/main_shaft.py
#	examples/windmill/_api/metmast.py
#	examples/windmill/_api/nacelle.py
#	examples/windmill/_api/power_inverter.py
#	examples/windmill/_api/rotor.py
#	examples/windmill/_api/sensor_position.py
#	examples/windmill/_api/windmill.py
  • Loading branch information
doctrino committed Nov 16, 2024
2 parents dbe8bee + 057508c commit 8359ceb
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 8359ceb

Please sign in to comment.