Merge branch 'latest-os-hpxml' of https://github.com/NREL/OpenStudio-… · NREL/OpenStudio-ERI@a13b8d6 · GitHub

Commit

Merge branch 'latest-os-hpxml' of https://github.com/NREL/OpenStudio-ERI

Browse files

 into ansi_301_2022

# Conflicts:
#	workflow/tests/base_results/real_homes.csv
#	workflow/tests/base_results/sample_files1.csv
#	workflow/tests/base_results/sample_files2.csv

Loading branch information

shorowit committed Jan 31, 2024

2 parents 3b0dbf6 + 6a58487 commit a13b8d6