From 0ffbf10879be855de450af61679fa92195b3db48 Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Mon, 19 Sep 2022 07:15:55 +0000
Subject: [PATCH] Fix conflict. #704

---
 src/Controller/APIUserController.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/Controller/APIUserController.php b/src/Controller/APIUserController.php
index dd93d7b8..122d3830 100644
--- a/src/Controller/APIUserController.php
+++ b/src/Controller/APIUserController.php
@@ -162,15 +162,9 @@ class APIUserController extends Controller
             // set api user in rider
             $rider->setAPIUser($obj);
 
-<<<<<<< HEAD
             $obj->setRider($rider)
                 ->setMetadata($meta);
         }
-=======
-        // set api user in rider
-        if ($rider != null)
-            $rider->setAPIUser($obj);
->>>>>>> 7416be842559728bbb3743c0035a6d26605eb1be
 
         // set and save values
         $obj->setName($req->request->get('name'))