Fix issue with previous merege conflict

MetOffice · Oct 9, 2024 · b5a5019 · b5a5019
1 parent ea8acea
commit b5a5019
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 17 deletions.
diff --git a/test/generate_unittest_netcdfs.py b/test/generate_unittest_netcdfs.py
diff --git a/test/testinput/cx_globalnamelist_abiclr.nc4 b/test/testinput/cx_globalnamelist_abiclr.nc4
diff --git a/test/testinput/cx_globalnamelist_ahiclr.nc4 b/test/testinput/cx_globalnamelist_ahiclr.nc4
diff --git a/test/testinput/cx_globalnamelist_amsr.nc4 b/test/testinput/cx_globalnamelist_amsr.nc4
diff --git a/test/testinput/cx_globalnamelist_atms.nc4 b/test/testinput/cx_globalnamelist_atms.nc4
diff --git a/test/testinput/cx_globalnamelist_atovs.nc4 b/test/testinput/cx_globalnamelist_atovs.nc4
diff --git a/test/testinput/cx_globalnamelist_gmihigh.nc4 b/test/testinput/cx_globalnamelist_gmihigh.nc4
diff --git a/test/testinput/cx_globalnamelist_gmilow.nc4 b/test/testinput/cx_globalnamelist_gmilow.nc4
diff --git a/test/testinput/cx_globalnamelist_gnssro.nc4 b/test/testinput/cx_globalnamelist_gnssro.nc4
diff --git a/test/testinput/cx_globalnamelist_iasi.nc4 b/test/testinput/cx_globalnamelist_iasi.nc4
diff --git a/test/testinput/cx_globalnamelist_mwsfy3.nc4 b/test/testinput/cx_globalnamelist_mwsfy3.nc4
diff --git a/test/testinput/cx_globalnamelist_scatwind.nc4 b/test/testinput/cx_globalnamelist_scatwind.nc4
diff --git a/test/testinput/cx_globalnamelist_screen.nc4 b/test/testinput/cx_globalnamelist_screen.nc4
diff --git a/test/testinput/cx_globalnamelist_seviriclr.nc4 b/test/testinput/cx_globalnamelist_seviriclr.nc4
diff --git a/test/testinput/cx_globalnamelist_ssmis.nc4 b/test/testinput/cx_globalnamelist_ssmis.nc4
diff --git a/test/testinput/cx_ukvnamelist_seviriasr.nc4 b/test/testinput/cx_ukvnamelist_seviriasr.nc4
diff --git a/test/testinput/cx_ukvnamelist_seviriclr.nc4 b/test/testinput/cx_ukvnamelist_seviriclr.nc4