##// 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

File last commit:

r6446:74c10b3c
r8798:c1e52e56 merge
Show More
_sysinfo.py
2 lines | 36 B | text/x-python | PythonLexer
# GENERATED BY setup.py
commit = ""