mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-04 08:24:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix bad merge

Browse source
This commit is contained in:
adam j hartz 2016-06-11 22:38:37 -04:00
parent 9ccf7f939c
commit a241d7a962
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/test_builtins.py
View file

@ -9,7 +9,7 @@ from nose.plugins.skip import SkipTest
from nose.tools import assert_equal, assert_true, assert_not_in
from xonsh import built_ins
from xonsh.built_ins import reglob, regexpath, helper, superhelper, \
from xonsh.built_ins import reglob, pathsearch, helper, superhelper, \
ensure_list_of_strs, list_of_strs_or_callables
from xonsh.environ import Env
from xonsh.tools import ON_WINDOWS