Merge branch 'cmr' into cmr_3sum

mkoeppe · Sep 13, 2023 · cff7132 · cff7132
2 parents d89ae6c + ec229ef
commit cff7132
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/sage/matrix/seymour_decomposition.pyx b/src/sage/matrix/seymour_decomposition.pyx
@@ -499,11 +499,19 @@ cdef class SpecialLeafNode(DecompositionNode):
 
     def _repr_(self):
         return f'Isomorphic to a minor of {self._matroid()}'
+<<<<<<< HEAD
+=======
+
+>>>>>>> cmr
     def rep_matrix(self):
         r"""
         WIP
         """
         assert NotImplementedError
+<<<<<<< HEAD
+=======
+
+>>>>>>> cmr
         cdef int representation_matrix
         cdef CMR_DEC_TYPE typ = CMRdecIsSpecialLeaf(self._dec, &representation_matrix)
         return Matrix_cmr_chr_sparse._from_data(representation_matrix, immutable=False)