Revert "re fix conflict"

This reverts commit ac4dcde6b7db3b30d7aeb5940c53bab02bb366fb.
Revert "ajout de la fonction permettant de rajouter une livraison dans une tournee et de redessiner le plan"

This reverts commit 6d087632384a846a1be70a7680e1e3a28c0b9ec8.
Revert "tostring PlageHorraire"

This reverts commit e7fe634c239e0d277c457962aed5d93dda7b10f4.
Revert "fix oubli d'une modif"

This reverts commit 856e4dcf8ba69ab115a8d6de38340acc1eb08054.
Revert "chgmt model pour entrepot"

This reverts commit 44916bb42522eacc499aa105b95b80bfd33406ca.
Revert "tentative de fix des images"

This reverts commit 146e9b1632084740124e70f4f26772d0dd262d34.
Revert "main dij comment"

This reverts commit 4b97ab431131aaa7af171eb0b2b4874e0e6059eb.
Revert "merle commun"

This reverts commit 5fb3be49816c7635c55360cbb49abbbf8f08828f.