GIT: fix merge/rebase artifact

This commit is contained in:
Mark Olesen
2019-01-22 19:25:53 +01:00
parent fafe1e564b
commit 4256da3291
2 changed files with 1 additions and 3 deletions

View File

@ -51,7 +51,7 @@ _foamEcho "Locating ThirdParty directory"
for WM_THIRD_PARTY_DIR in \
"$WM_PROJECT_DIR/ThirdParty" \
"$prefixDir/ThirdParty-$FOAM_API" \
"$prefixDir/ThirdParty-$WM_PROJECT_VERSION" \
"$prefixDir/ThirdParty-v$FOAM_API" \
"$prefixDir/ThirdParty-$FOAM_API" \
"$prefixDir/ThirdParty-common" \

View File

@ -878,8 +878,6 @@ void Foam::boundaryCutter::updateMesh(const mapPolyMesh& morphMap)
if (newStart >= 0 && newEnd >= 0)
{
const labelList& addedPoints = iter.object();
labelList newAddedPoints(addedPoints.size());
label newI = 0;