attempting to fix merge conflict

mcallic2 · Nov 9, 2023 · 3b9033e · 3b9033e
2 parents 9f94158 + 9658a9a
commit 3b9033e
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/mosaic2/mosaic2.F90 b/mosaic2/mosaic2.F90
@@ -430,6 +430,7 @@ function transfer_to_model_index(istart, iend, refine_ratio)
    return
 
 end function transfer_to_model_index
+<<<<<<< HEAD
 
   !###############################################################################
   !> @brief Calculate grid cell area.
@@ -552,6 +553,8 @@ function is_inside_polygon(lon1, lat1, lon2, lat2 )
      return
 
   end function is_inside_polygon
+=======
+>>>>>>> 9658a9a9d0688bd097cd014a5cb988d3d82e9424
 
   function parse_string(string, set, sval)
   character(len=*),  intent(in) :: string