zhyang-dev/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
mattijs
2009-01-20 17:11:07 +00:00
parent b308b17b89 c44f8aee42
commit bbade8795a
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties
View File

@ -14,10 +14,6 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
<<<<<<< HEAD:tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties
simulationType RASModel;
=======
simulationType RASModel;
>>>>>>> c2eac7aaca53e9702c56bbbbd2c0dc47a83829e0:tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties
// ************************************************************************* //