Merge branch 'master' of https://srccontrol.orr.noaa.gov/gnome/pygnome

NOAA-ORR-ERD · Apr 3, 2017 · 3bbb724 · 3bbb724
2 parents 2c3b665 + e362e61
commit 3bbb724
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/conda_requirements.txt b/conda_requirements.txt
@@ -23,14 +23,8 @@ colander>=1.2
 sqlalchemy>=0.7.6
 zope.interface>=4.1
 zope.sqlalchemy>=0.7.6
-<<<<<<< HEAD
 gdal>=2.1.1
 netCDF4=1.2.7
-=======
-hdf5=1.8.*
-netCDF4=1.2.7
-gdal>=2.1.1
->>>>>>> develop
 awesome-slugify>=1.6
 regex>=2014.12
 unidecode>=0.04.19