remove trailing whitespace

openfoam/run/flowAroundCylinder/system/blockMeshDict

@@ -23,7 +23,12 @@ 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
 (
@@ -52,12 +57,12 @@ vertices
     name Bcr (5 0 $thickness)
     name Fct (0 5 0)
     name Bct (0 5 $thickness)
-    name Fcbl (#calc "-$rx" #calc "-$rx" 0) 
-    name Bcbl (#calc "-$rx" #calc "-$rx" $thickness) 
+    name Fcbl (#calc "-$rx" #calc "-$rx" 0)
+    name Bcbl (#calc "-$rx" #calc "-$rx" $thickness)
     name Fcbr ($rx #calc "-$rx" 0)
     name Bcbr ($rx #calc "-$rx" $thickness)
-    name Fctl (#calc "-$rx" $rx 0) 
-    name Bctl (#calc "-$rx" $rx $thickness) 
+    name Fctl (#calc "-$rx" $rx 0)
+    name Bctl (#calc "-$rx" $rx $thickness)
     name Fctr ($rx $rx 0)
     name Bctr ($rx $rx $thickness)
     name Fnl (-20 0 0)
@@ -70,7 +75,7 @@ vertices
     name Btm (0 21 $thickness)
     name Fns (20 0 0)
     name Bns (20 0 $thickness)
-    name Fnm (0 0 0)  
+    name Fnm (0 0 0)
     name Bnm (0 0 1)
 );