From f13c054aef8b5e8abb940b6388b67291576d9baf Mon Sep 17 00:00:00 2001
From: Caluera <caluera@protonmail.com>
Date: Sun, 10 Oct 2021 19:21:39 +0200
Subject: [PATCH] fix merge conflict

---
 lib/Service/TicketService.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/lib/Service/TicketService.php b/lib/Service/TicketService.php
index d34bda5..b93f73a 100644
--- a/lib/Service/TicketService.php
+++ b/lib/Service/TicketService.php
@@ -106,11 +106,7 @@ class TicketService {
 			$title = array_get($matrixTicketContent, "title", "Untitled");
 			$description = array_get($matrixTicketContent, "description", "");
 			$lastModified = $this->matrix->getLastEventDate($ticket->getMatrixRoom());
-<<<<<<< HEAD
-			$matrixHelperUser = array_get($matrixTicketContent, "matrixHelperUser", "nicht zugewiesen"); 
-=======
-			$matrixHelperUserName = array_get($matrixTicketContent, "matrixHelperUserName", "nicht zugewiesen"); 
->>>>>>> ae0ffa811f99d5ee49597ff70a01aed705377b0c
+			$matrixHelperUser = array_get($matrixTicketContent, "matrixHelperUser", "nicht zugewiesen");
 			$expirationDate = array_get($matrixTicketContent, "expiration date", "");
 			return array(
 				'ticketId' => $ticketId,
@@ -118,11 +114,7 @@ class TicketService {
 				'lastModified' => $lastModified,
 				'title' => $title,
 				'description' => $description,
-<<<<<<< HEAD
 				'matrixHelperUser' => $matrixHelperUser,
-=======
-				'matrixHelferName' => $matrixHelperUserName,
->>>>>>> ae0ffa811f99d5ee49597ff70a01aed705377b0c
 				'expirationDate' => $expirationDate 
 			);
 		} catch (MatrixException | RoomNotFoundException $e) {