From c44f8aee424dd4761469b57d4303e14ead80634e Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Tue, 20 Jan 2009 16:33:31 +0000
Subject: [PATCH] Choosing mine.

---
 tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties b/tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties
index 67756557b3..3d7edb19ec 100644
--- 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
 
 // ************************************************************************* //