p_monsalvete 4700cd037a Merge remote-tracking branch 'origin/systems_catalog' into systems_catalog ... # Conflicts: # hub/data/construction/nrcan_archetypes.json		2023-05-19 15:04:31 -04:00
hub	Merge remote-tracking branch 'origin/systems_catalog' into systems_catalog	2023-05-19 15:04:31 -04:00
pyproject.toml	Partial correction of persistence	2023-01-31 13:11:39 -05:00
requirements.txt	adding peak loads partial	2023-04-18 12:23:03 -04:00
setup.py	adding peak loads partial	2023-04-18 12:23:03 -04:00