##// END OF EJS Templates
updating my code to incorporate upstream changes; resolved a merge conflict in IPython/lib/display.py
updating my code to incorporate upstream changes; resolved a merge conflict in IPython/lib/display.py
Greg Caporaso -
r8798:c1e52e56 merge
Show More
Name Size Modified Last Commit Author
/ IPython / frontend / qt
console
__init__.py Loading ...
base_frontend_mixin.py Loading ...
kernelmanager.py Loading ...
rich_text.py Loading ...
svg.py Loading ...
util.py Loading ...