mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-01-30 16:10:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Missed a merge conflict marker, fixed that.

Browse Source
This commit is contained in:
Ward Fisher 2022-01-25 10:43:42 -07:00
parent 89decab388
commit 1d3d2ea5eb
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nc_test/tst_inmemory.c
View File

@ -213,15 +213,11 @@ writefile(const char* path, NC_memio* memio)
char* p = NULL;
/* Open the file for writing */
<<<<<<< HEAD
f = NCfopen(path,"w");
=======
#ifdef _WIN32
f = fopen(path,"wb");
#else
f = fopen(path,"w");
#endif
>>>>>>> 4657eef36d6d20b46b48796ea160c7776459add7
if(f == NULL)
{status = errno; goto done;}
count = memio->size;