Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
cdo
Commits
328c51f9
Commit
328c51f9
authored
Oct 18, 2019
by
Oliver Heidmann
Browse files
fixed forgotten merge marker
parent
d04d92d1
Changes
1
Hide whitespace changes
Inline
Side-by-side
test/Ydrunstat.test.in
View file @
328c51f9
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment