Merge branch 'master' into gh479-conflict-resolution

This commit is contained in:
Ward Fisher 2018-04-18 13:48:58 -06:00
commit d7ead42c3e
2 changed files with 2 additions and 2 deletions

View File

@ -12,7 +12,7 @@ See \ref copyright file for copying and redistribution conditions.
#include <stdio.h>
#include <stdarg.h>
#include "netcdf.h"
#include "math.h"
#include <math.h>
/** \defgroup v2_api The Version 2 API

View File

@ -10,7 +10,7 @@
#include <nc_tests.h>
#include "err_macros.h"
#include "netcdf.h"
#include "math.h"
#include <math.h>
#define FILE_NAME "tst_converts2.nc"
#define VAR_NAME "Monkey"