GIT: Resolved conflict

This commit is contained in:
Andrew Heather
2015-12-09 09:32:38 +00:00
246 changed files with 4020 additions and 788 deletions

View File

@ -180,10 +180,7 @@ void Foam::valueAverage::execute()
void Foam::valueAverage::end()
{
if (active_)
{
execute();
}
// Do nothing
}