merge conflict

eade219e · Qiwei Ye · f23e6083 · 060bd316 · eade219e · eade219e
Commit eade219e authored Mar 18, 2017 by Qiwei Ye
9 changed files
--- a/src/treelearner/serial_tree_learner.h
+++ b/src/treelearner/serial_tree_learner.h
--- a/src/treelearner/split_info.hpp
+++ b/src/treelearner/split_info.hpp
--- a/src/treelearner/voting_parallel_tree_learner.cpp
+++ b/src/treelearner/voting_parallel_tree_learner.cpp
--- a/tests/python_package_test/test_basic.py
+++ b/tests/python_package_test/test_basic.py
--- a/tests/python_package_test/test_engine.py
+++ b/tests/python_package_test/test_engine.py
--- a/tests/python_package_test/test_plotting.py
+++ b/tests/python_package_test/test_plotting.py
--- a/tests/python_package_test/test_sklearn.py
+++ b/tests/python_package_test/test_sklearn.py
--- a/windows/LightGBM.vcxproj
+++ b/windows/LightGBM.vcxproj
--- a/windows/LightGBM.vcxproj.filters
+++ b/windows/LightGBM.vcxproj.filters