Issue696 hp improvs merge conflicts (!878) · Merge requests · Marco Braun / AixLib · GitLab

Aufgrund einer Wartung am 30.07.2024 von 8:00 bis 09:00 Uhr werden git.rwth-aachen.de & git-ce.rwth-aachen.de zeitweise nicht zur Verfügung stehen. -- Due to maintenance at 30.07.2024 from 8:00 to 09:00, git.rwth-aachen.de & git-ce.rwth-aachen.de will be temporarily unavailable.

Philipp Mehrfeld requested to merge issue696_HPImprovs_MergeConflicts into issue696_HeatPumpImprovementsAndMinorBugs Mar 16, 2020

Since PR #769 could not be updated with development, I created an extra branch from development to solve merge conflicts.