Commit bfbab344 authored by henry's avatar henry
Browse files

Corrected merge conflicts from header changes.

parent 6574570b
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
/*--------------------------------*- 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 | |
\*---------------------------------------------------------------------------*/
......
/*--------------------------------*- 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 | |
\*---------------------------------------------------------------------------*/
......
/*--------------------------------*- 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
......
/*--------------------------------*- 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
......
/*--------------------------------*- 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
......
/*--------------------------------*- 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
......
Supports Markdown
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