Skip to content
Snippets Groups Projects
Commit 8ff328ad authored by Bruce Flynn's avatar Bruce Flynn
Browse files

.

parent e1a4000c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
metobs/data/solar_position.py
+ 5
− 0
View file @ 8ff328ad
...@@ -69,7 +69,12 @@ https://cvs.ssec.wisc.edu/cgi-bin/cvsweb.cgi/java/tower/SolarPosition.java ...@@ -69,7 +69,12 @@ https://cvs.ssec.wisc.edu/cgi-bin/cvsweb.cgi/java/tower/SolarPosition.java
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
<<<<<<< Updated upstream
from metobs.data import NaN, util from metobs.data import NaN, util
=======
from metobs import mytime
from metobs.data import NaN
>>>>>>> Stashed changes
import math import math
_days = ["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"] _days = ["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"]
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment