solve merge conflicts with origin/rank_desc

peterpanmj · peterpanmj · commit 8254cec49301 · 2018-03-12T17:35:52.000+08:00
diff --git a/pandas/tests/series/test_rank.py b/pandas/tests/series/test_rank.py
@@ -19,7 +19,6 @@
 from itertools import chain
 import pandas.util._test_decorators as td
 
-
 class TestSeriesRank(TestData):
     s = Series([1, 3, 4, 2, nan, 2, 1, 5, nan, 3])
 
