Commit 328c51f9 authored by Oliver Heidmann's avatar Oliver Heidmann
Browse files

fixed forgotten merge marker

parent d04d92d1
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment