1

app/Controller/CollectorController.php

@@ -215,14 +215,9 @@ class CollectorController extends AbstractController
                 if ($validator->fails()) {
                     $errorMessage = $validator->errors()->first();
                     return Result::error($errorMessage);
-<<<<<<< HEAD
-                }  
-                break;
-=======
                 } 
 
                 break; 
->>>>>>> collector_1106_fr
             case 2:
                 $validator = $this->validationFactory->make(
                     $requireData,