From e362e611c064e98c962fc565294c5dbc1967c130 Mon Sep 17 00:00:00 2001
From: Chris Barker <Chris.Barker@noaa.gov>
Date: Mon, 3 Apr 2017 16:48:57 -0700
Subject: [PATCH] fixed conflicts in conda_requirements.txt

---
 conda_requirements.txt | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/conda_requirements.txt b/conda_requirements.txt
index 3517a0bb0..176544f9e 100644
--- 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