From 4256da3291d42f83057f119f34a52f57affac487 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 22 Jan 2019 19:25:53 +0100
Subject: [PATCH] GIT: fix merge/rebase artifact
---
etc/config.sh/setup | 2 +-
.../meshCut/meshModifiers/boundaryCutter/boundaryCutter.C | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/etc/config.sh/setup b/etc/config.sh/setup
index eeff98c2e39..ed692ec2595 100644
--- a/etc/config.sh/setup
+++ b/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" \
diff --git a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
index 8319a43162d..924ecbb04f6 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
+++ b/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;
--
GitLab