##// 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
/ docs / source / config / extensions
autoreload.txt Loading ...
cythonmagic.txt Loading ...
index.txt Loading ...
octavemagic.txt Loading ...
rmagic.txt Loading ...
storemagic.txt Loading ...
sympyprinting.txt Loading ...