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
..
concordia_energy_consumption.py	Merge remote-tracking branch 'origin/master'	2021-06-02 09:31:04 -04:00