merge conflict fixup

Author: WillAyd

doc/source/whatsnew/v1.0.0.rst

@@ -330,7 +330,7 @@ Note that errors will now be raised when conflicting or potentially ambiguous ar
    Out[1]:
       0
    1  1
-   
+
    In [2]: df.rename(mapper={0: 1}, index={0: 2})
    Out[2]:
       0
@@ -339,7 +339,7 @@ Note that errors will now be raised when conflicting or potentially ambiguous ar
 *pandas 1.0.0*
 
 .. ipython:: python
-   
+
    df.rename({0: 1}, index={0: 2})
    df.rename(mapper={0: 1}, index={0: 2})
 
@@ -357,7 +357,7 @@ keywords.
 .. ipython:: python
 
    df.rename(index={0: 1}, columns={0: 2})
-		
+
 Extended verbose info output for :class:`~pandas.DataFrame`
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -441,7 +441,6 @@ As a reminder, you can specify the ``dtype`` to disable all inference.
    >>> a[2]
    nan
 
->>>>>>> upstream/master
 *pandas 1.0.0*
 
 .. ipython:: python