Fix conflict. #704

2022-09-19 07:15:55 +00:00 · 2022-09-19 07:15:55 +00:00 · 0ffbf10879
commit 0ffbf10879
parent c42d2973f4
1 changed files with 0 additions and 6 deletions
--- 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'))