Commit c44f8aee authored by henry's avatar henry
Browse files

Choosing mine.

parent f97160ba
......@@ -14,10 +14,6 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
<<<<<<< HEAD:tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties
simulationType RASModel;
=======
simulationType RASModel;
>>>>>>> c2eac7aaca53e9702c56bbbbd2c0dc47a83829e0:tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties
// ************************************************************************* //
Markdown is supported
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