From dde04a75bc2b83fc52fc196b4581cf3cf97c46ff Mon Sep 17 00:00:00 2001
From: Enrique Hernandez <hernandeze2@xavier.edu>
Date: Sun, 7 Mar 2021 18:53:50 -0600
Subject: [PATCH] messenger.vue css confict resolution

---
 src/components/inputItem/inputController.ts |  2 +-
 src/views/messenger.vue                     | 20 ++++++--------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/components/inputItem/inputController.ts b/src/components/inputItem/inputController.ts
index 6fb5e8c..d9aeb51 100644
--- a/src/components/inputItem/inputController.ts
+++ b/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;
diff --git a/src/views/messenger.vue b/src/views/messenger.vue
index b1e965f..e0769da 100644
--- a/src/views/messenger.vue
+++ b/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;
 
-- 
2.43.0