Skip to content

Commit

Permalink
removed merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
heloisemichaud committed Feb 24, 2025
2 parents 0059723 + cb3e687 commit 3b6099b
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion model/src/w3ounfmetamd.F90
Original file line number Diff line number Diff line change
Expand Up @@ -2752,7 +2752,6 @@ SUBROUTINE DEFAULT_META()
META(1)%ENAME = '.zet'
META(1)%VARNM='zet'
META(1)%VARNL='wave_setup'
!META(1)%VARNS='sediment_grain_size'
META(1)%VARNS=''
META(1)%VARNG='wave_setup'
META(1)%VMIN = -100.
Expand Down

0 comments on commit 3b6099b

Please sign in to comment.