Conflicts: sklearn/datasets/_svmlight_format.c sklearn/datasets/_svmlight_format.pyx sklearn/datasets/tests/test_svmlight_format.py sklearn/preprocessing/__init__.py |
||
|---|---|---|
| .. | ||
| __init__.py | ||
| test_preprocessing.py | ||
Conflicts: sklearn/datasets/_svmlight_format.c sklearn/datasets/_svmlight_format.pyx sklearn/datasets/tests/test_svmlight_format.py sklearn/preprocessing/__init__.py |
||
|---|---|---|
| .. | ||
| __init__.py | ||
| test_preprocessing.py | ||