Skip to content
Snippets Groups Projects
Commit 8cc22981 authored by Todd Gamblin's avatar Todd Gamblin
Browse files

Merge branch 'features/python-2.6-compatibility' into develop 

- Changed 'import argparse' to 'from external import argparse' in conflicts.

Conflicts:
	lib/spack/spack/cmd/dotkit.py
	lib/spack/spack/cmd/unuse.py
	lib/spack/spack/cmd/use.py
parents 42e27d04 48d5281e
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 3135 additions and 26 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment