BUG: Fix merge issues

applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C

@@ -571,7 +571,6 @@ void Foam::conformalVoronoiMesh::createExternalEdgePointGroup
             Pstream::myProcNo()
         )
     );
-    );
 }
 
 
@@ -706,7 +705,6 @@ void Foam::conformalVoronoiMesh::createInternalEdgePointGroup
             Pstream::myProcNo()
         )
     );
-    );
 
     if (nAddPoints == 1)
     {
@@ -848,7 +846,6 @@ void Foam::conformalVoronoiMesh::createMultipleEdgePointGroup
     const labelList& edNormalIs = feMesh.edgeNormals()[edHit.index()];
 
     Info<< edNormalIs.size() << endl;
-    Info<< feMesh.edgeBaffles(edHit.index()) << endl;
 
     // As this is a flat edge, there are two normals by definition
     const vector& nA = feNormals[edNormalIs[0]];

applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H

@@ -430,7 +430,6 @@ inline void Foam::conformalVoronoiMesh::createBafflePointPair
             Pstream::myProcNo()
         )
     );
-    );
 }
 
 

applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C

@@ -644,7 +644,6 @@ Foam::autoPtr<Foam::fvMesh> Foam::conformalVoronoiMesh::createDummyMesh
                 0,          //patchStarts[p],
                 patchI,
                 mesh.boundaryMesh(),
-                mesh.comm(),
                 readLabel(patchDicts[patchI].lookup("myProcNo")),
                 readLabel(patchDicts[patchI].lookup("neighbProcNo")),
                 coupledPolyPatch::COINCIDENTFULLMATCH

etc/bashrc

@@ -32,7 +32,7 @@
 #------------------------------------------------------------------------------
 
 export WM_PROJECT=OpenFOAM
-export WM_PROJECT_VERSION=dev
+export WM_PROJECT_VERSION=dev-cvMesh-foghorn
 
 ################################################################################
 # USER EDITABLE PART: Changes made here may be lost with the next upgrade