diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary index f580ba31065e04a200da514e589efe5749ae3ac6..39c75e0d212e04c31d992b8a6bc1e7be7caa6a45 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary @@ -2,11 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -<<<<<<< HEAD | \\ / A nd | Web: www.OpenFOAM.com | -======= -| \\ / A nd | Web: www.OpenFOAM.org | ->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary index ff6f22bad948f437701756bde781e9e9ee531df9..4c44b92b595ba5fed8a0a3733406d5815815aff2 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary @@ -2,11 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -<<<<<<< HEAD | \\ / A nd | Web: www.OpenFOAM.com | -======= -| \\ / A nd | Web: www.OpenFOAM.org | ->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties index ecbca25509f38eca19bb4da0d48da8eaa88e2c0a..1597ab89059120cb6f18a9c26f37c6599104e3c5 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties @@ -2,11 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -<<<<<<< HEAD | \\ / A nd | Web: www.OpenFOAM.com | -======= -| \\ / A nd | Web: www.OpenFOAM.org | ->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties index 28dfd330415acd97bdd3a0b64b2136883af99548..64a74514b8b25763e981bc6df2a317a895d8502f 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties @@ -2,11 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -<<<<<<< HEAD | \\ / A nd | Web: www.OpenFOAM.com | -======= -| \\ / A nd | Web: www.OpenFOAM.org | ->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/turbulenceProperties index 5da159ec0ccf7ac18c8dd97e5201a2cb58fc20a0..e01c7d0bdb74fc55f9957b281c04de102e626f04 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/turbulenceProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/turbulenceProperties @@ -2,11 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -<<<<<<< HEAD | \\ / A nd | Web: www.OpenFOAM.com | -======= -| \\ / A nd | Web: www.OpenFOAM.org | ->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/boundary index f580ba31065e04a200da514e589efe5749ae3ac6..39c75e0d212e04c31d992b8a6bc1e7be7caa6a45 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/boundary +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/boundary @@ -2,11 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -<<<<<<< HEAD | \\ / A nd | Web: www.OpenFOAM.com | -======= -| \\ / A nd | Web: www.OpenFOAM.org | ->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/fixedInlet b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/fixedInlet index 6aa487df9460b8395e2e5490108370cca6f6b09a..491f5d824cff66bf5f7765c5d0cc59873d5bc755 100644 --- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/fixedInlet +++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/fixedInlet @@ -1,13 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -<<<<<<< HEAD:tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/cp | \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.com | -======= -| \\ / O peration | Version: 1.7 | -| \\ / A nd | Web: http://www.OpenFOAM.org | ->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b:tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/fixedInlet | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/sideAndTopPatches b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/sideAndTopPatches index f83fee59b6fec6ae229e2769e8af1d65dc3cf410..c383ea3a819ecabb01c7cfbc78a1af43144f82b9 100644 --- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/sideAndTopPatches +++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/sideAndTopPatches @@ -1,13 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -<<<<<<< HEAD:tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/0/K | \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.com | -======= -| \\ / O peration | Version: 1.7 | -| \\ / A nd | Web: http://www.OpenFOAM.org | ->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b:tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/sideAndTopPatches | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/nut b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/nut index ba9af11558241e069d40c3d0ed0d220b986d734d..dbff87ae2a1e88981992ab0e6c29340154ccb0b2 100644 --- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/nut +++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/nut @@ -1,13 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -<<<<<<< HEAD:tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/K | \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.com | -======= -| \\ / O peration | Version: 1.7 | -| \\ / A nd | Web: www.OpenFOAM.org | ->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b:tutorials/incompressible/simpleFoam/windTurbineTerrain/0/nut | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/p b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/p index 4c6261340817ebb4a829d0792472c3ac238c963d..1449474a5ee10fe342848a654bae1bd10146cb03 100644 --- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/p +++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/0/p @@ -1,13 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -<<<<<<< HEAD:tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/cp | \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.com | -======= -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: http://www.OpenFOAM.org | ->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b:tutorials/incompressible/simpleFoam/windTurbineTerrain/0/p | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/constant/RASProperties b/tutorials/incompressible/simpleFoam/windTurbineTerrain/constant/RASProperties index a33d9a3df2d7ff7f889a1a2d49e723344412c7d1..492ab236e15f177750bdc948c164c98aac959f97 100644 --- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/constant/RASProperties +++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/constant/RASProperties @@ -1,13 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -<<<<<<< HEAD:tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/rho | \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.com | -======= -| \\ / O peration | Version: 1.7 | -| \\ / A nd | Web: http://www.OpenFOAM.org | ->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b:tutorials/incompressible/simpleFoam/windTurbineTerrain/constant/RASProperties | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict b/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict index 4e7364749352766b56e9ae8057f38b545256dc22..ede2ec0462cc1d909f96e5c8b0325df853e40870 100644 --- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict +++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict @@ -1,13 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -<<<<<<< HEAD:tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/K | \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.com | -======= -| \\ / O peration | Version: 1.7 | -| \\ / A nd | Web: http://www.OpenFOAM.org | ->>>>>>> 34d87d1a94f83ac39028abe5f447f2b6d069380b:tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile