rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Fix conflict. #704

Browse source
This commit is contained in:
Korina Cordero 2022-09-19 07:15:55 +00:00
parent c42d2973f4
commit 0ffbf10879
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Controller/APIUserController.php
View file

@ -162,15 +162,9 @@ class APIUserController extends Controller
// set api user in rider // set api user in rider
$rider->setAPIUser($obj); $rider->setAPIUser($obj);
<<<<<<< HEAD
$obj->setRider($rider) $obj->setRider($rider)
->setMetadata($meta); ->setMetadata($meta);
} }
=======
// set api user in rider
if ($rider != null)
$rider->setAPIUser($obj);
>>>>>>> 7416be842559728bbb3743c0035a6d26605eb1be
// set and save values // set and save values
$obj->setName($req->request->get('name')) $obj->setName($req->request->get('name'))