Fix merge conflicts.

NREL · Dec 4, 2024 · 30293ca · 30293ca
1 parent 369e1fc
commit 30293ca
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 52 deletions.
diff --git a/resources/hpxml-measures/workflow/tests/test_real_homes.rb b/resources/hpxml-measures/workflow/tests/test_real_homes.rb
diff --git a/resources/hpxml-measures/workflow/tests/test_sample_files.rb b/resources/hpxml-measures/workflow/tests/test_sample_files.rb