fix merge conflict
This commit is contained in:
commit
b6f3ca6b14
|
@ -106,7 +106,11 @@ class TicketService {
|
||||||
$title = array_get($matrixTicketContent, "title", "Untitled");
|
$title = array_get($matrixTicketContent, "title", "Untitled");
|
||||||
$description = array_get($matrixTicketContent, "description", "");
|
$description = array_get($matrixTicketContent, "description", "");
|
||||||
$lastModified = $this->matrix->getLastEventDate($ticket->getMatrixRoom());
|
$lastModified = $this->matrix->getLastEventDate($ticket->getMatrixRoom());
|
||||||
|
<<<<<<< HEAD
|
||||||
$matrixHelperUser = array_get($matrixTicketContent, "matrixHelperUser", "nicht zugewiesen");
|
$matrixHelperUser = array_get($matrixTicketContent, "matrixHelperUser", "nicht zugewiesen");
|
||||||
|
=======
|
||||||
|
$matrixHelperUserName = array_get($matrixTicketContent, "matrixHelperUserName", "nicht zugewiesen");
|
||||||
|
>>>>>>> ae0ffa811f99d5ee49597ff70a01aed705377b0c
|
||||||
$expirationDate = array_get($matrixTicketContent, "expiration date", "");
|
$expirationDate = array_get($matrixTicketContent, "expiration date", "");
|
||||||
return array(
|
return array(
|
||||||
'ticketId' => $ticketId,
|
'ticketId' => $ticketId,
|
||||||
|
@ -114,7 +118,11 @@ class TicketService {
|
||||||
'lastModified' => $lastModified,
|
'lastModified' => $lastModified,
|
||||||
'title' => $title,
|
'title' => $title,
|
||||||
'description' => $description,
|
'description' => $description,
|
||||||
|
<<<<<<< HEAD
|
||||||
'matrixHelperUser' => $matrixHelperUser,
|
'matrixHelperUser' => $matrixHelperUser,
|
||||||
|
=======
|
||||||
|
'matrixHelferName' => $matrixHelperUserName,
|
||||||
|
>>>>>>> ae0ffa811f99d5ee49597ff70a01aed705377b0c
|
||||||
'expirationDate' => $expirationDate
|
'expirationDate' => $expirationDate
|
||||||
);
|
);
|
||||||
} catch (MatrixException | RoomNotFoundException $e) {
|
} catch (MatrixException | RoomNotFoundException $e) {
|
||||||
|
|
Loading…
Reference in a new issue