Cleaned up after commit

gregorylivschitz · gregorylivschitz · commit dba4b1779903 · 2020-04-03T18:14:24.000-04:00
diff --git a/doc/source/whatsnew/v1.1.0.rst b/doc/source/whatsnew/v1.1.0.rst
@@ -90,7 +90,6 @@ Other enhancements
 - :meth:`MultiIndex.union` will now raise `RuntimeWarning` if the object inside are unsortable, pass `sort=False` to suppress this warning (:issue:`33015`)
 - :meth:`get_schema` will now allow a schema kwarg that will add a schema into the create table statement
 -
->>>>>>> a44ac3483c4263fba4a1d69e407211d2370cda6d
 
 .. ---------------------------------------------------------------------------
 

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,6 @@ Other enhancements`
`90`	`90`	- :meth:`MultiIndex.union` will now raise `RuntimeWarning` if the object inside are unsortable, pass `sort=False` to suppress this warning (:issue:`33015`)
`91`	`91`	- :meth:`get_schema` will now allow a schema kwarg that will add a schema into the create table statement
`92`	`92`	`-`
`93`		`->>>>>>> a44ac3483c4263fba4a1d69e407211d2370cda6d`
`94`	`93`
`95`	`94`	`.. ---------------------------------------------------------------------------`
`96`	`95`