##// END OF EJS Templates
Merge branch 'master' into htmlnotebook...
Merge branch 'master' into htmlnotebook Conflicts: setupbase.py

File last commit:

r3408:261328d5
r4518:fd892df5 merge
Show More
__init__.py
4 lines | 72 B | text/x-python | PythonLexer
try:
from path import *
except ImportError:
from _path import *