Fixed merge conflicts with develop branch

This commit is contained in:
Will Boyd 2015-09-25 16:24:06 -04:00
commit e05ab41527
99 changed files with 5737 additions and 3263 deletions

View file

@ -32,7 +32,7 @@ kwargs = {'name': 'openmc',
if have_setuptools:
kwargs.update({
# Required dependencies
'install_requires': ['numpy', 'scipy', 'h5py', 'matplotlib'],
'install_requires': ['numpy', 'h5py', 'matplotlib'],
# Optional dependencies
'extras_require': {