fix git diff

4ee32a77 · felix · 27c30156 · 4ee32a77
Commit 4ee32a77 authored 3 years ago by felix
--- a/openfoam/run/flowAroundCylinder/system/blockMeshDict
+++ b/openfoam/run/flowAroundCylinder/system/blockMeshDict
@@ -23,12 +23,7 @@ rx 3.5355339059327373;
 arcNx #calc "50 * $N";
 arcNy #calc " 30 * $N";

-<<<<<<< HEAD
 thickness 100;    // in other files 0.5 = 50 cm = 50 is assumed to be a valid z coordinate (probes)
-=======
-thickness 100    // in other files 0.5 = 50 cm = 50 is assumed to be a valid z coordinate (probes)
-
->>>>>>> a9c83a8... remove trailing whitespace

 vertices
 (