diff options
| author | Jan Aagaard Meier <janzeh@gmail.com> | 2014-04-15 15:31:19 +0200 |
|---|---|---|
| committer | Jan Aagaard Meier <janzeh@gmail.com> | 2014-04-15 15:31:19 +0200 |
| commit | 44bd9f6177671361ece91383e64d9e8b73658e7d (patch) | |
| tree | b2662163ab3e744eea9f485515559a018c6afc7f /setup.py | |
| parent | c35a95a2dbdad407cc959faff0ca31475ed7c0a0 (diff) | |
| parent | 79370bb9dfc5494f7be98135648b8f5b3c79802a (diff) | |
| download | networkx-44bd9f6177671361ece91383e64d9e8b73658e7d.tar.gz | |
Fix merge conflict in setup.py
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -97,7 +97,7 @@ package_data = { 'networkx.algorithms.components': ['tests/*.py'], 'networkx.algorithms.connectivity': ['tests/*.py'], 'networkx.algorithms.coloring': ['tests/*.py'], - 'networkx.algorithms.flow': ['tests/*.py'], + 'networkx.algorithms.flow': ['tests/*.py', 'tests/*.bz2'], 'networkx.algorithms.traversal': ['tests/*.py'], 'networkx.algorithms.isomorphism': ['tests/*.py','tests/*.*99'], 'networkx.algorithms.link_analysis': ['tests/*.py'], |