From 45db186dfdcdc2939b9d4d36471f667f5344c5f5 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 16:00:08 +0200
Subject: [PATCH] more merge errors

---
 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 8c32a76bd..e7651f613 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -72,7 +72,7 @@ export default {
           SET room.lastMessageAt = toString(datetime())
           RETURN message {
             .*,
-            room: properties(room)
+            room: properties(room),
             otherUser: properties(otherUser),
             senderId: currentUser.id,
             username: currentUser.name,