Merge remote-tracking branch 'origin/master' into track-address-reference-update

src/Bundle/ChillMainBundle/Entity/Address.php

@@ -523,12 +523,12 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
     /**
      * Update the ref status
      *
-<<<<<<< HEAD
+     * <<<<<<< HEAD
      * @param Address::ADDR_REFERENCE_STATUS_* $refStatus
      * @param bool|null $updateLastUpdate Also update the "refStatusLastUpdate"
-=======
+     * =======
      * The refstatuslast update is also updated
->>>>>>> 31152616d (Feature: Provide api endpoint for reviewing addresses)
+     * >>>>>>> 31152616d (Feature: Provide api endpoint for reviewing addresses)
      */
     public function setRefStatus(string $refStatus, ?bool $updateLastUpdate = true): self
     {