[178390751]: fix rebase problem

Author: ernestoarbitrio

tests/unit/matrix/test_assembler.py

@@ -41,7 +41,6 @@
     _ColumnWeightedBases,
     _Means,
     _PopulationProportions,
-    _MarginProportion,
     _PairwiseIndices,
     _PairwiseSubvarIndices,
     _PairwiseMeansIndices,
@@ -1050,10 +1049,6 @@ def _assemble_matrix_(self, request):
     def _assemble_pw_indices_(self, request):
         return method_mock(request, Assembler, "_assemble_pw_indices")
 
-    @pytest.fixture
-    def base_margin_(self, request):
-        return instance_mock(request, _UnweightedBaseMargin)
-
     @pytest.fixture
     def _BaseOrderHelper_(self, request):
         return class_mock(request, "cr.cube.matrix.assembler._BaseOrderHelper")