From c9a5d0548cb34d862274c94632ec6df401a23513 Mon Sep 17 00:00:00 2001
From: Marc Ducobu <marc.ducobu@champs-libres.coop>
Date: Wed, 12 May 2021 15:57:19 +0200
Subject: [PATCH] Removing spaces at the end of line

---
 src/Bundle/ChillPersonBundle/config/services.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/config/services.yaml b/src/Bundle/ChillPersonBundle/config/services.yaml
index c2f60a729..b4737c523 100644
--- a/src/Bundle/ChillPersonBundle/config/services.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services.yaml
@@ -2,9 +2,12 @@ parameters:
 #    cl_chill_person.example.class: Chill\PersonBundle\Example
 
 services:
+<<<<<<< HEAD
     _defaults:
         autowire: true
         autoconfigure: true
+=======
+>>>>>>> Removing spaces at the end of line
 
     Chill\PersonBundle\Service\:
         resource: '../Service/'