Merge remote-tracking branch 'origin/internal_zones' into internal_zones

Browse Source

# Conflicts:
#	catalogs/catalog.py
#	catalogs/greenery/greenery_catalog.py
#	catalogs/greenery_catalog_factory.py
#	city_model_structure/city.py
#	city_model_structure/lca_calculations.py
#	imports/life_cycle_assessment/lca_vehicle.py
#	imports/sensors/concordia_energy_consumption.py

...

This commit is contained in:

Guille Gutierrez 2022-03-24 18:48:32 -04:00

parent 7a29bef239 7488b6ba91

commit 8b002e483b

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available