Choosing mine.

c44f8aee · henry · f97160ba · c44f8aee
Commit c44f8aee authored 16 years ago by henry
--- a/tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties
+++ b/tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties
@@ -14,10 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-<<<<<<< HEAD:tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties
-simulationType RASModel;
-=======
 simulationType      RASModel;
->>>>>>> c2eac7aaca53e9702c56bbbbd2c0dc47a83829e0:tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties

 // ************************************************************************* //