mathlib4-merge-conflict-bot

Results 6 comments of


                                            mathlib4-merge-conflict-bot

feat(Bicategory/Functorbicategory): define bicategory of pseudofunctors

This pull request has conflicts, please merge `master` and resolve them.

feat(Order/Hom/Basic): `WithBot (Fin n) ≃o Fin (n + 1)`

This pull request has conflicts, please merge `master` and resolve them.

feat(LinearAlgebra/Multilinear/DirectSum, LinearAlgebra/DirectSum/{PiTensorProduct,Finsupp}): interaction between `MultilinearMap` and `DirectSum`, and between `PiTensorProduct` and `DirectSum`

This pull request has conflicts, please merge `master` and resolve them.

feat: Hoeffding's lemma

This pull request has conflicts, please merge `master` and resolve them.

feat(Algebra/Category/ModuleCat/Presheaf): the endofunctor of presheaves of modules induced by an oplax natural transformation

This pull request has conflicts, please merge `master` and resolve them.

fix(GeneralizeProofs): unreachable! bug

This pull request has conflicts, please merge `master` and resolve them.