From 8ff328adc639cc54cdf5da312272622e23188df9 Mon Sep 17 00:00:00 2001
From: Bruce <brucef@ssec.wisc.edu>
Date: Fri, 26 Jun 2015 17:43:15 +0000
Subject: [PATCH] .

---
 metobs/data/solar_position.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/metobs/data/solar_position.py b/metobs/data/solar_position.py
index 5954e47..a2405ab 100644
--- a/metobs/data/solar_position.py
+++ b/metobs/data/solar_position.py
@@ -69,7 +69,12 @@ https://cvs.ssec.wisc.edu/cgi-bin/cvsweb.cgi/java/tower/SolarPosition.java
 
 __docformat__ = 'restructuredtext en'
 
+<<<<<<< Updated upstream
 from metobs.data import NaN, util
+=======
+from metobs import mytime
+from metobs.data import NaN
+>>>>>>> Stashed changes
 import math
 
 _days = ["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"]
-- 
GitLab