fix conflitti I guess

2025-06-23 12:13:02 +02:00
parent e5870b8ea3 0d40d3730f
commit 570a1eea81
1 changed files with 1 additions and 0 deletions
--- a/Fotovoltaico.py
+++ b/Fotovoltaico.py
@@ -92,6 +92,7 @@ path_export_hourly = path_export.replace('.csv', '_hourly.csv')
 # Esporta il file orario
 export_hourly_pv_productivity(result_ac_energies_to_csv_df, path_export_hourly)

+<<<<<<< HEAD
 import pandas as pd
 import plotly.express as px