fixed forgotten merge marker

test/Ydrunstat.test.in

@@ -6,11 +6,7 @@ test -n "$DATAPATH" || DATAPATH="@abs_top_srcdir@/test/data/"
 #
 HAS_NETCDF=`${CDO} --config has-nc`
 #
-<<<<<<< HEAD
-TYPES="ydrun"
-=======
 OPERTYPES="ydrun"
->>>>>>> simplified tests and cleaned them up
 STATS="min max sum avg mean std std1 var var1"
 FMS="srv grb"
 if [ "${HAS_NETCDF}" = yes ] ; then  FMS="$FMS nc"; fi