Update GPL submodule

shogun-toolbox · Jun 9, 2019 · 0cd2e63 · 0cd2e63
1 parent a8e8852
commit 0cd2e63
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/src/gpl b/src/gpl
diff --git a/src/shogun/regression/LeastAngleRegression.cpp b/src/shogun/regression/LeastAngleRegression.cpp
@@ -103,20 +103,6 @@ void CLeastAngleRegression::plane_rot(ST x0, ST x1,
 }
 
 template <typename ST, typename U>
-<<<<<<< HEAD
-<<<<<<< HEAD
-bool CLeastAngleRegression::train_machine_templated(
-=======
-void CLeastAngleRegression::train_machine_templated(
->>>>>>> a59bb425e... Make train_machine_templated return void
-	const CDenseFeatures<ST>* data)
-{
-	train_machine_templated(data, m_labels);
-}
-
-template <typename ST, typename U>
-=======
->>>>>>> 47e1ee350... LeastAngleRegression f
 void CLeastAngleRegression::train_machine_templated(
 	const CDenseFeatures<ST>* features, CLabels* labels)
 {