IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Dario Rekowski on RockPI 2020-10-26 15:02:27 +00:00 committed by Ulf Gebhardt
commit 26d1cfe0fe
No known key found for this signature in database
GPG Key ID: 81308EFE29ABFEBD
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Controller/JsonRequestHandlerController.php
View File

@ -59,7 +59,6 @@ class JsonRequestHandlerController extends AppController {
case 'getUsers' : return $this->getUsers($jsonData->page, $jsonData->limit); case 'getUsers' : return $this->getUsers($jsonData->page, $jsonData->limit);
case 'getUserBalance': return $this->getUserBalance($jsonData->email, $jsonData->last_name); case 'getUserBalance': return $this->getUserBalance($jsonData->email, $jsonData->last_name);
case 'errorInTransaction': return $this->errorInTransaction($jsonData->created, $jsonData->transactionGenericHash, $jsonData->error, $jsonData->errorMessage); case 'errorInTransaction': return $this->errorInTransaction($jsonData->created, $jsonData->transactionGenericHash, $jsonData->error, $jsonData->errorMessage);
} }
return $this->returnJson(['state' => 'error', 'msg' => 'unknown method for post', 'details' => $method]); return $this->returnJson(['state' => 'error', 'msg' => 'unknown method for post', 'details' => $method]);
} }

2
src/protobuf

@ -1 +1 @@
Subproject commit 9004e6978ac3dafcc635b2ffcf8bc6a156451cca Subproject commit 81a461566e46d71533dc3e284fa075d7d68fd020