Fix lint error

Author: mroeschke

doc/source/whatsnew/v0.21.0.txt

@@ -487,7 +487,11 @@ Conversion
 - Bug in ``IntervalIndex.is_non_overlapping_monotonic`` when intervals are closed on both sides and overlap at a point (:issue:`16560`)
 - Bug in :func:`Series.fillna` returns frame when ``inplace=True`` and ``value`` is dict (:issue:`16156`)
 - Bug in :attr:`Timestamp.weekday_name` returning a UTC-based weekday name when localized to a timezone (:issue:`17354`)
+<<<<<<< 1aad541e5d75b62ff2c8e2b433b0531836c7627f
 - Bug in ``Timestamp.replace`` when replacing ``tzinfo`` around DST changes (:issue:`15683`)
+=======
+
+>>>>>>> Fix lint error
 - Bug in localization of a naive, datetime string in a ``Series`` constructor with a ``datetime[ns, timezone]`` dtype (:issue:`174151`)
 
 Indexing

pandas/core/dtypes/cast.py

@@ -971,7 +971,7 @@ def maybe_cast_to_datetime(value, dtype, errors='raise'):
                                 # Strings here are naive, so directly localize
                                 value = value.tz_localize(dtype.tz)
                             else:
-                                # Numeric values are UTC at this point, 
+                                # Numeric values are UTC at this point,
                                 # so localize and convert
                                 value = (value.tz_localize('UTC')
                                          .tz_convert(dtype.tz))