Guillermo Gutierrez Morote 4bf2ff4ff0 Merge branch 'master' into 'db_persistence' ... # Conflicts: # .gitignore # city_model_structure/city.py # requirements.txt # unittests/test_energy_systems_water_to_water_hp.py		2023-01-09 21:36:44 +00:00
..
air_source_hp_export.py	Included an option for return dictionary when output file is None	2022-08-18 16:45:55 -04:00
heat_pump_export.py	Merge branch 'master' into 'db_persistence'	2023-01-09 21:36:44 +00:00
water_to_water_hp_export.py	Included an option for return dictionary when output file is None	2022-08-18 16:45:55 -04:00