fix

Quantco · Dec 8, 2023 · b0b2d3e · b0b2d3e
1 parent ede0c63
commit b0b2d3e
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/glum/_glm.py b/src/glum/_glm.py
@@ -1410,8 +1410,7 @@ def predict(
             )
             X = self._convert_from_pandas(X, context=captured_context)
 
-<<<<<<< HEAD
-=======
+
         X = check_array_tabmat_compliant(
             X,
             accept_sparse=["csr", "csc", "coo"],
@@ -1421,7 +1420,7 @@ def predict(
             allow_nd=False,
             drop_first=getattr(self, "drop_first", False),
         )
->>>>>>> main
+
         eta = self.linear_predictor(
             X, offset=offset, alpha_index=alpha_index, alpha=alpha
         )