##// 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
editors.txt Loading ...
index.txt Loading ...
integrating.txt Loading ...
ipython.txt Loading ...
old.txt Loading ...
overview.txt Loading ...