From 6145a47965d1095c633e24ec13cd40f9babd05a3 Mon Sep 17 00:00:00 2001
From: jay <jlaura@asu.edu>
Date: Thu, 7 Jun 2018 13:10:23 -0700
Subject: [PATCH] Bad merge

---
 plio/io/io_gdal.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plio/io/io_gdal.py b/plio/io/io_gdal.py
index 416efd9..249511d 100644
--- a/plio/io/io_gdal.py
+++ b/plio/io/io_gdal.py
@@ -227,7 +227,6 @@ class GeoDataset(object):
         return self._unit_type
 
     @property
-<<<<<<< HEAD
     def north_up(self):
         return True
         if self.footprint:
@@ -236,8 +235,6 @@ class GeoDataset(object):
             return True
 
     @property
-=======
->>>>>>> 2f82f6bf36ebf5124f2f0448f824f3eb14f05e64
     def spatial_reference(self):
         if not getattr(self, '_srs', None):
             self._srs = osr.SpatialReference()
-- 
GitLab