fixing merge issues

This commit is contained in:
Andrew Gundersen 2021-03-13 12:07:49 -06:00
commit 06592ee7ca

View file

@ -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 = () => {