min-field correction

NREL · Aug 15, 2023 · 123b82e · 123b82e · nrel-bot-2b · Aug 15, 2023
1 parent cf72d6e
commit 123b82e
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/idd/Energy+.idd.in b/idd/Energy+.idd.in
@@ -53010,11 +53010,7 @@ Coil:Cooling:DX:VariableSpeed,
         \memo wet coil when compressor cycles off with continuous fan operation. Requires two to
         \memo ten sets of performance data and will interpolate between speeds. Modeled as a
         \memo single coil with variable-speed compressor.
-<<<<<<< HEAD
-        \min-fields 32
-=======
-        \min-fields 36
->>>>>>> origin/develop
+        \min-fields 35
    A1,  \field Name
         \required-field
         \type alpha