household address: fix conflict on branch merge

This commit is contained in:
nobohan
2021-06-29 17:47:40 +02:00
20 changed files with 310 additions and 122 deletions

View File

@@ -46,6 +46,7 @@ services:
$serializer: '@Symfony\Component\Serializer\SerializerInterface'
$dispatcher: '@Symfony\Contracts\EventDispatcher\EventDispatcherInterface'
$validator: '@Symfony\Component\Validator\Validator\ValidatorInterface'
$workRepository: '@Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository'
tags: ['controller.service_arguments']
Chill\PersonBundle\Controller\AccompanyingCourseApiController: