Fix conflicts

Author: cbcrespo

pvlib/irradiance.py

@@ -878,7 +878,6 @@ def haydavies(surface_tilt, surface_azimuth, dhi, dni, dni_extra,
 
 def reindl(surface_tilt, surface_azimuth, dhi, dni, ghi, dni_extra,
            solar_zenith, solar_azimuth, return_components=False):
-           solar_zenith, solar_azimuth, return_components=False):
     r'''
     Determine the diffuse irradiance from the sky on a tilted surface using
     the Reindl (1990) model.
@@ -921,10 +920,6 @@ def reindl(surface_tilt, surface_azimuth, dhi, dni, ghi, dni_extra,
         Flag used to decide whether to return the calculated diffuse components
         or not.
 
-    return_components : bool, default False
-        Flag used to decide whether to return the calculated diffuse components
-        or not.
-
     Returns
     -------
     numeric, Dict, or DataFrame
@@ -1005,8 +1000,6 @@ def reindl(surface_tilt, surface_azimuth, dhi, dni, ghi, dni_extra,
 
     SVF = (1 + tools.cosd(surface_tilt)) / 2
 
-    SVF = (1 + tools.cosd(surface_tilt)) / 2
-
     with np.errstate(invalid='ignore', divide='ignore'):
         hb_to_ghi = np.where(ghi == 0, 0, np.divide(HB, ghi))
     h = np.sqrt(hb_to_ghi) * (tools.sind(surface_tilt / 2) ** 3)