Merge branch '1.4.1-prerelease' of https://github.com/MathCancer/Phys…

…iCell into 1.4.1-prerelease
MathCancer · Sep 30, 2018 · 620798b · 620798b
2 parents 4ba41ea + d07c784
commit 620798b
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/BioFVM/BioFVM_mesh.cpp b/BioFVM/BioFVM_mesh.cpp
@@ -340,12 +340,8 @@ void General_Mesh::read_from_matlab( std::string filename )
 	bounding_box[4] = -9e99; 
 	bounding_box[5] = -9e99; 
 
-<<<<<<< HEAD
         size_t result;
-	for( int i=0; i < number_of_data_entries ; i++ )
-=======
 	for( unsigned int i=0; i < number_of_data_entries ; i++ )
->>>>>>> 6fa1e820807c64eea133e97fd6a5c057b3bd3720
 	{
 		result = fread( (char*) &( voxels[i].center[0] ) , sizeof(double) , 1 , fp ); 
 		result = fread( (char*) &( voxels[i].center[1] ) , sizeof(double) , 1 , fp ); 
@@ -993,12 +989,8 @@ void Cartesian_Mesh::read_from_matlab( std::string filename )
 	bounding_box[4] = -9e99; 
 	bounding_box[5] = -9e99; 
 
-<<<<<<< HEAD
         size_t result;
-	for( int i=0; i < number_of_data_entries ; i++ )
-=======
 	for( unsigned int i=0; i < number_of_data_entries ; i++ )
->>>>>>> 6fa1e820807c64eea133e97fd6a5c057b3bd3720
 	{
 		result = fread( (char*) &( voxels[i].center[0] ) , sizeof(double) , 1 , fp ); 
 		result = fread( (char*) &( voxels[i].center[1] ) , sizeof(double) , 1 , fp );