guille 85a275d7c1 Merge remote-tracking branch 'origin/master' ... # Conflicts: # city_model_structure/attributes/concordia_energy_sensor.py		2021-06-02 09:31:04 -04:00
..
constructions	Create new factory to import concordia energy files into the libs.	2021-06-01 18:31:50 -04:00
geometry	Create new factory to import concordia energy files into the libs.	2021-06-01 18:31:50 -04:00
schedules	Create new factory to import concordia energy files into the libs.	2021-06-01 18:31:50 -04:00
sensors	Merge remote-tracking branch 'origin/master'	2021-06-02 09:31:04 -04:00
usages	Create new factory to import concordia energy files into the libs.	2021-06-01 18:31:50 -04:00
weather	Create new factory to import concordia energy files into the libs.	2021-06-01 18:31:50 -04:00
construction_factory.py	Create new factory to import concordia energy files into the libs.	2021-06-01 18:31:50 -04:00
geometry_factory.py	Create new factory to import concordia energy files into the libs.	2021-06-01 18:31:50 -04:00
schedules_factory.py	Create new factory to import concordia energy files into the libs.	2021-06-01 18:31:50 -04:00
sensors_factory.py	Create new factory to import concordia energy files into the libs.	2021-06-01 18:31:50 -04:00
usage_factory.py	Create new factory to import concordia energy files into the libs.	2021-06-01 18:31:50 -04:00
weather_factory.py	Create new factory to import concordia energy files into the libs.	2021-06-01 18:31:50 -04:00