One more rebase fixup

efiring · efiring · commit f407192a1ab1 · 2018-01-03T16:13:56.000-10:00
diff --git a/lib/matplotlib/scale.py b/lib/matplotlib/scale.py
@@ -9,7 +9,8 @@
 from matplotlib import cbook, docstring, rcParams
 from matplotlib.ticker import (
     NullFormatter, ScalarFormatter, LogFormatterSciNotation, LogitFormatter,
-    NullLocator, LogLocator, AutoLocator, SymmetricalLogLocator, LogitLocator)
+    NullLocator, LogLocator, AutoLocator, AutoMinorLocator,
+    SymmetricalLogLocator, LogitLocator)
 from matplotlib.transforms import Transform, IdentityTransform
 
 
