Rebase changes made by hand

13 years ago · 2d8f647b58
parent 8c6665ab4c
commit 2d8f647b58
1 changed files with 1 additions and 1 deletions
--- a/IPython/nbconvert/exporters/python.py
+++ b/IPython/nbconvert/exporters/python.py
@ -15,7 +15,7 @@ Python exporter which exports Notebook code into a PY file.

 from IPython.utils.traitlets import Unicode

-from .exporter import TemplateExporter
+from .templateexporter import TemplateExporter

 #-----------------------------------------------------------------------------
 # Classes