Skip to content

Commit

Permalink
Merge branch 'latest-os-hpxml' of https://github.com/NREL/OpenStudio-ERI
Browse files Browse the repository at this point in the history
 into ansi_301_2022

# Conflicts:
#	hpxml-measures/BuildResidentialHPXML/measure.xml
#	hpxml-measures/Changelog.md
#	hpxml-measures/HPXMLtoOpenStudio/measure.xml
#	hpxml-measures/ReportSimulationOutput/measure.xml
#	hpxml-measures/workflow/tests/base_results/results_workflow_simulations1.csv
#	hpxml-measures/workflow/tests/base_results/results_workflow_simulations1_bills.csv
#	hpxml-measures/workflow/tests/base_results/results_workflow_simulations2.csv
#	hpxml-measures/workflow/tests/base_results/results_workflow_simulations2_bills.csv
  • Loading branch information
shorowit committed Jan 25, 2024
2 parents 32aac35 + bbbdaac commit 7dfdb4c
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 7dfdb4c

Please sign in to comment.