remove merge crap

Author: alorenzo175

pvlib/test/test_irradiance.py

@@ -254,8 +254,6 @@ def test_dirint_coeffs():
     assert coeffs[0,0,0,0] == 0.385230
     assert coeffs[0,1,2,1] == 0.229970
     assert coeffs[3,2,6,3] == 1.032260
-<<<<<<< HEAD
-=======
 
 
 def test_erbs():
@@ -285,4 +283,3 @@ def test_erbs_all_scalar():
     out = irradiance.erbs(ghi, zenith, doy)
 
     assert_frame_equal(out, expected)
->>>>>>> e8635d0a8e4ff43b3fb465489737852d2bc8a7d2