mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-11-21 03:13:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removed dangling conflict info.

Browse Source
This commit is contained in:
Ward Fisher 2020-12-07 12:18:30 -07:00
parent 878866c039
commit d58a21cb5f
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ncdump/CMakeLists.txt
View File

@ -307,18 +307,15 @@ ENDIF(MSVC)
add_sh_test(ncdump tst_ctests)
<<<<<<< HEAD
IF(ENABLE_UNFIXED_MEMORY_LEAKS)
SET_TESTS_PROPERTIES(ncdump_run_ncgen_nc4_tests.sh ncdump_tst_nccopy4.sh ncdump_tst_ncgen_shared.sh ncdump_tst_netcdf4.sh
PROPERTIES ENVIRONMENT NC_VLEN_NOTEST=1)
ENDIF()
=======
IF(USE_CDF5)
add_sh_test(ncdump test_keywords)
ENDIF()
>>>>>>> 90b912b7e8675f857b618a440610ada3327f4190
ENDIF()
ENDIF()