Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int… · NREL/OpenStudio-HPXML@0b8efb9 · GitHub

Commit

Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…

Browse files

…o gshp-pump-power

# Conflicts:
#	workflow/tests/base_results/results_simulations_bills.csv
#	workflow/tests/base_results/results_simulations_energy.csv
#	workflow/tests/base_results/results_simulations_loads.csv
#	workflow/tests/base_results/results_simulations_misc.csv

Loading branch information

shorowit committed Nov 15, 2024

2 parents de78403 + cba77dd commit 0b8efb9