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

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

View File

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