resolved conflicts

Author: jungkyoJung

tests/python/packages/CMakeLists.txt

@@ -42,6 +42,7 @@ foreach(TESTFILE ${TESTFILES})
     set_property(TEST ${TESTNAME} PROPERTY WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${DIR})
 endforeach()
 
+
 set_tests_properties(test.python.pkg.nisar.workflows.geo2rdr PROPERTIES
              DEPENDS test.python.pkg.nisar.workflows.rdr2geo)
 set_tests_properties(test.python.pkg.nisar.workflows.resample_slc PROPERTIES
@@ -50,6 +51,7 @@ set_tests_properties(test.python.pkg.nisar.workflows.crossmul PROPERTIES
              DEPENDS test.python.pkg.nisar.workflows.resample_slc)
 set_tests_properties(test.python.pkg.nisar.workflows.filter_interferogram PROPERTIES
              DEPENDS test.python.pkg.nisar.workflows.crossmul)
+
 # using rdr2geo outputs as RUNW rasters to confirm geocode run
 # using RUNW HDF5 needed as a verifiable dummy RUNW input
 set_tests_properties(test.python.pkg.nisar.workflows.geocode_insar PROPERTIES