fix merge conflicts

mfdavies · Jan 7, 2024 · 63173dd · 63173dd
1 parent 91208a6
commit 63173dd
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/frontend/src/views/patient/PatientHome.jsx b/frontend/src/views/patient/PatientHome.jsx
@@ -44,11 +44,7 @@ const PatientHome = () => {
   return (
     <div className="flex flex-col h-screen">
       <Navbar />
-<<<<<<< HEAD
-      <main className="flex-grow p-12 overflow-hidden">
-=======
       <main className="flex-grow pl-6 overflow-hidden">
->>>>>>> main
         <div className="flex h-full">
           <div className="w-2/3 flex flex-col justify-between h-full left-column">
             <header>
@@ -80,16 +76,10 @@ const PatientHome = () => {
         </div>
       </main>
       <div className="relative">
-<<<<<<< HEAD
         <VoiceAI
           updateUserMessage={updateUserMessage}
           updateGptResponse={updateGptResponse}
         />
-=======
-        <div className="absolute bottom-8 left-1/2 transform -translate-x-1/2">
-          {/* <Ai3D /> */}
-        </div>
->>>>>>> main
       </div>
       {/* TODO: finish button that calls conversation/end */}
     </div>