fix conflict when merging

2025-08-21 07:03:49 +00:00 · 2021-06-03 15:11:09 +02:00
parent 43fb020272 93a67c9ab9
commit f6d4d32ce4
108 changed files with 2766 additions and 1105 deletions
--- a/src/Bundle/ChillMainBundle/Entity/Address.php
+++ b/src/Bundle/ChillMainBundle/Entity/Address.php
@@ -153,8 +153,8 @@ class Address
     * @var ThirdParty|null
     *
     * @ORM\ManyToOne(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty")
-     * @ORM\JoinColumn(nullable=true)
     * @groups({"write"})
+     * @ORM\JoinColumn(nullable=true, onDelete="SET NULL")
     */
    private $linkedToThirdParty;