UPDATE : Changing TopographicPhase Filter with the new OTB function : LineToSatPositionAndVelocity

include/otbSARTopographicPhaseImageFilter.txx

@@ -431,10 +431,7 @@ namespace otb
 	indexMasterPerLine[0] = 0; // Always 0 since Master/Slave Cartesain Per Line are vectors
 	indexMasterPerLine[1] = ind_Line;
 
-<<<<<<< HEAD
-=======
 
->>>>>>> UPDATE : Removing unuseful calculations with new satelitte position estimation + Adapting StripMap Chain
 	// Get the index of current tile into grid to retrive the shifts (the closest (round) grid point 
 	// at the center of current tile). Output Geo = Master Cart Mean Geo = (Grid geo / GridStep) 
 	int Lgrid =  std::round( ind_Line / m_GridStep[1]);