Merge branch 'dev' into df/#878-thermalGridIT

# Conflicts: # src/main/scala/edu/ie3/simona/model/participant/HpModel.scala
ie3-institute · Nov 1, 2024 · 2bc339e · 2bc339e
2 parents 0e28577 + f51a719
commit 2bc339e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/scala/edu/ie3/simona/model/participant/HpModel.scala b/src/main/scala/edu/ie3/simona/model/participant/HpModel.scala
@@ -413,7 +413,7 @@ object HpModel {
     * temperature.
     *
     * @param isRunning
-    *   indicates if CHP is turned on
+    *   indicates if HP is turned on
     * @param tick
     *   the time tick of the HpState
     * @param ambientTemperature