Commit 4256da32 authored by Mark Olesen's avatar Mark Olesen
Browse files

GIT: fix merge/rebase artifact

parent fafe1e56
......@@ -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" \
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment