messenger.vue css confict resolution

src/components/inputItem/inputController.ts

@@ -63,7 +63,7 @@ export default function useInputController() {
             return;
         }
         if (input === " " && isRecording.value === false) {
-            // isTyping.value = false;
+            isTyping.value = false;
             isRecording.value = true;
             post('update-recorder', isRecording.value);
             return;

src/views/messenger.vue

@@ -25,19 +25,19 @@ export default defineComponent({
     // List of messages in the view.
     // Oldest message first.
     const messages: Message[] = reactive([]);
-    const messages_ref: any = {}
+    const messages_ref: any = {};
 
     // Render a message.
     // Called on "enter" instead of on "recv message"
     const render = (message: Message) => {
       messages.push(message);
       messages_ref[message.id] = message;
-    }
+    };
 
     // Annotate/update an existing message.
     const annotate = (message: Message) => {
-      1+1
-    }
+      1 + 1;
+    };
 
     onMounted(() => {
       // Listen for new messages to render.
@@ -61,19 +61,11 @@ export default defineComponent({
 #messenger {
   position: fixed;
 
-<<<<<<< HEAD
   width: 100vw;
-  min-height: 100vh;
-=======
-  #messenger {
-    position: fixed;
 
-    width: 100vw;
+  overflow-y: scroll;
 
-    overflow-y: scroll;
-
-    bottom: 0;
->>>>>>> origin/main
+  bottom: 0;
 
   overflow-y: scroll;