add unit test from Jesse (fix)

NOAA-GFDL · Feb 24, 2025 · b1b6d70 · b1b6d70
1 parent 8df00e6
commit b1b6d70
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/coupler/gex.F90 b/coupler/gex.F90
@@ -263,7 +263,6 @@ function gex_get_property(MODEL_SRC,MODEL_REC,gex_index,property)
 end function gex_get_property
 
 !> @brief Function to return index of exchanged field
-<<<<<<< HEAD
 function gex_get_index(MODEL_SRC,MODEL_REC,name,record)
 
    character(len=*), intent(in)                :: name !< name of the tracer