fix merge errors

Author: floriankozikowski

skglm/experimental/sqrt_lasso.py

@@ -106,13 +106,7 @@ class SqrtLasso(LinearModel, RegressorMixin):
     """
 
     def __init__(self, alpha=1., max_iter=100, max_pn_iter=100, p0=10,
-<< << << < HEAD
                  tol=1e-4, verbose=0, fit_intercept=True):
-
-
-== == == =
-                 tol = 1e-4, verbose = 0, fit_intercept = False):
->>>>>> > 69bf74f (first try , add support for fit_intercept in sqrtLasso, TODOS: review if correct, clean up, pot. add support for sparse X (not sure if that works), enhance docstring)
         super().__init__()
         self.alpha = alpha
         self.max_iter = max_iter

skglm/experimental/tests/test_sqrt_lasso.py

@@ -77,11 +77,9 @@ def test_PDCD_WS(with_dual_init):
     penalty = L1(alpha)
 
     w = PDCD_WS(dual_init=dual_init).solve(X, y, datafit, penalty)[0]
-<<<<<<< HEAD
+
     clf = SqrtLasso(alpha=alpha, fit_intercept=False, tol=1e-12).fit(X, y)
-=======
-    clf = SqrtLasso(alpha=alpha, tol=1e-12).fit(X, y)
->>>>>>> origin/main
+
     np.testing.assert_allclose(clf.coef_, w, atol=1e-6)