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

Removed stray 'conflict resolution' information.

Browse Source
This commit is contained in:
Ward Fisher 2014-03-10 12:46:05 -06:00
parent 19d377e87a
commit 7c02e67fb1
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cf
View File

@ -19,10 +19,7 @@ DAP=1
CFLAGS=""
#CFLAGS="-Wall -Wno-unused-variable -Wno-unused-parameter -Wconversion ${CFLAGS}"
#CFLAGS="-Wall -Wno-unused-variable -Wno-unused-parameter ${CFLAGS}"
<<<<<<< HEAD
#CFLAGS="-Wconversion"
=======
>>>>>>> 513cb29ea4eb4e1087c9dbcdf3471e08c741fb2b
FORCE="-i"