Changeset 9046

Timestamp:

2017-12-14T14:25:04+01:00 (7 years ago)

Author:

timgraham

Message:

Remove missed ">>>>right" line from merge

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_opa_sponge.F90 (modified) (1 diff)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_opa_sponge.F90

@@ -400 +400 @@
          ubdiff(i1:i2,j1:j2,:) = (ub(i1:i2,j1:j2,:) - tabres(i1:i2,j1:j2,:,1))*umask(i1:i2,j1:j2,:)
 #endif
->>>>>>> .merge-right.r9019
          !
          DO jk = 1, jpkm1                                 ! Horizontal slab