small addition/cleanup + resolved merge conflict

tp · tp · commit ddd9eab3481f · 2017-09-28T12:08:34.000+02:00
diff --git a/pandas/core/indexes/multi.py b/pandas/core/indexes/multi.py
@@ -2366,7 +2366,7 @@ def get_locs(self, seq):
 
         See also
         --------
-        get_loc : Get location for a label or a tuple of labels.
+        MultiIndex.get_loc : Get location for a label or a tuple of labels.
         """
 
         # must be lexsorted to at least as many levels
