From 06592ee7ca7c44e52f43035c24c1aebaec74ca17 Mon Sep 17 00:00:00 2001
From: Andrew Gundersen <gundersena@xavier.edu>
Date: Sat, 13 Mar 2021 12:07:49 -0600
Subject: [PATCH] fixing merge issues

---
 src/modules/messages.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/modules/messages.ts b/src/modules/messages.ts
index d1329bf..a745c03 100644
--- a/src/modules/messages.ts
+++ b/src/modules/messages.ts
@@ -36,12 +36,13 @@ export default function useMessages() {
       messages.value.set(m.uid, m);
     }
 
-    const updateMessage = (m: Annotation) => {
+    const updateMessage = (a: Annotation) => {
         // update message if in the map.
-        if (messages.value.has(m.uid)) {
-            messages.value.get(m.uid).context = m.context;
-            messages.value.get(m.uid).content.text = m.text;
-        }
+        const m = messages.value.get(a.uid)
+        m.context = a.context
+        m.text = a.text
+
+        return m
     }
 
     const saveMessages = () => {
-- 
2.43.0