Merge remote-tracking branch 'origin/master'

Conflicts: solver_bcgsl.hpp

Merge remote-tracking branch 'origin/master'
Conflicts: solver_bcgsl.hpp
bee269a9 · Kirill Terekhov · 95a568f0 · c42ca152 · bee269a9
Commit bee269a9 authored Jun 09, 2015 by Kirill Terekhov
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

solver_bcgsl.hpp solver_bcgsl.hpp +1 -1

No files found.
--- a/solver_bcgsl.hpp
+++ b/solver_bcgsl.hpp
@@ -632,7 +632,7 @@ namespace INMOST
 				reason = "initial solution satisfy tolerances";
 				halt = true;
 			}
-			
+
 #if defined(USE_OMP)
 #pragma omp parallel
 #endif