Commit bee269a9 authored by Kirill Terekhov's avatar Kirill Terekhov

Merge remote-tracking branch 'origin/master'

Conflicts:
	solver_bcgsl.hpp
parents 95a568f0 c42ca152
......@@ -632,7 +632,7 @@ namespace INMOST
reason = "initial solution satisfy tolerances";
halt = true;
}
#if defined(USE_OMP)
#pragma omp parallel
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment