GIT: fix merge/rebase artifact

etc/config.sh/setup

@@ -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" \

src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C

@@ -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;