rte-i / Antares_Simulator

Antares-Simulator is an Open Source power system simulator to quantify the adequacy or the economic performance of interconnected energy systems, at short or remote time horizons.
https://antares-simulator.org
Other
1 stars 0 forks source link

Fix conflicts with rte/develop #59

Closed flomnes closed 2 years ago

flomnes commented 2 years ago

Hi @rtei-pw, to make your life easier I fixed conflicts with our branch into your latest branch.