From 27600f0e79538d7ab1260c36b9848ebef6bb290e Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 15:59:32 +0200
Subject: [PATCH] fix merge error

---
 backend/src/schema/resolvers/messages.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index e1b988221..8c32a76bd 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -73,7 +73,7 @@ export default {
           RETURN message {
             .*,
             room: properties(room)
-            otherUser: properties(otherUser)
+            otherUser: properties(otherUser),
             senderId: currentUser.id,
             username: currentUser.name,
             avatar: image.url,