##// END OF EJS Templates
Merge branch 'issue-31'...
Merge branch 'issue-31' Conflicts: IPython/core/magic.py closes gh-31

File last commit:

r3408:261328d5
r3460:11e30b27 merge
Show More
__init__.py
4 lines | 72 B | text/x-python | PythonLexer
try:
from guid import *
except ImportError:
from _guid import *