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

@ -70,6 +70,11 @@ bool Foam::localPointRegion::isDuplicate
const bool forward
)
{
if (f0.size() != f1.size())
{
return false;
}
label fp1 = findIndex(f1, f0[0]);
if (fp1 == -1)