Conflict correction

NREL · Aug 16, 2023 · cfee11b · cfee11b · nrel-bot-2 · Aug 16, 2023
1 parent b03e970
commit cfee11b
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 115 deletions.
diff --git a/src/EnergyPlus/UnitarySystem.cc b/src/EnergyPlus/UnitarySystem.cc
@@ -11976,7 +11976,6 @@ namespace UnitarySystems {
             }
         } break;
         case DataHVACGlobals::Coil_HeatingWaterToAirHPSimple: {
-            }
 
             WaterToAirHeatPumpSimple::SimWatertoAirHPSimple(state,
                                                             blankString,