Choosing mine.

This commit is contained in:
henry
2009-01-20 16:33:31 +00:00
parent f97160ba7a
commit c44f8aee42

View File

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