merge

Author: wholmgren

pvlib/test/test_tmy.py

@@ -16,7 +16,11 @@
 def test_readtmy3():
     tmy.readtmy3(tmy3_testfile)
 
+<<<<<<< HEAD
 @network(raise_on_error=True)
+=======
+@network
+>>>>>>> 13ef2d6e007a8203e3364f14e9e734674db1638f
 def test_readtmy3_remote():
     url = 'http://rredc.nrel.gov/solar/old_data/nsrdb/1991-2005/data/tmy3/703165TYA.CSV'
     tmy.readtmy3(url)