Merge branch 'refs/heads/dev' into df/#856-tap-water · ie3-institute/simona@e2b7cd1 · GitHub

Commit

Merge branch 'refs/heads/dev' into df/#856-tap-water

Browse files

# Conflicts:
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseAndStorageSpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithStorageOnlySpec.scala
#	src/test/scala/edu/ie3/simona/test/common/input/HpInputTestData.scala

Loading branch information

danielfeismann committed Sep 17, 2024

2 parents f915164 + 476ec84 commit e2b7cd1