From 637e497cb795faf80cb5dad752e2c20297efe2b6 Mon Sep 17 00:00:00 2001
From: Steven Zhou <stevenz9@uci.edu>
Date: Sat, 27 May 2023 12:24:07 -0700
Subject: [PATCH 1/2] login conflicts fixed

---
 src/components/Login/Login.jsx | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/src/components/Login/Login.jsx b/src/components/Login/Login.jsx
index 4bd9904..f13fa45 100644
--- a/src/components/Login/Login.jsx
+++ b/src/components/Login/Login.jsx
@@ -102,7 +102,6 @@ export default function Login() {
                 </Button>
               )}
             </Stack>
-<<<<<<< HEAD
           </form>
           <Link color={"blue.500"} onClick={() => setIsSignUp(!isSignUp)}>
             {isSignUp ? "Have Account? Sign In" : "No Account? Create One"}
@@ -119,22 +118,4 @@ export default function Login() {
       </Flex>
     </Stack>
   );
-=======
-
-            <Button colorScheme={'blue'} variant={'solid'}>
-              Sign in
-            </Button>
-        </Stack>
-    </Stack>
-      </Flex >
-    <Flex flex={1}>
-      <Image
-        alt={'Login Image'}
-        objectFit={'cover'}
-        src={'https://www.pinmaps.net/Images/homecr/home-page-image.png'}
-      />
-    </Flex>
-    </Stack >
-  )
->>>>>>> master
 }

From b77039af52042851f28c26b7ace599cec062444f Mon Sep 17 00:00:00 2001
From: jessieh9 <104229166+jessieh9@users.noreply.github.com>
Date: Sat, 27 May 2023 13:12:02 -0700
Subject: [PATCH 2/2] added mail to on contact me button

---
 src/components/Contact/Contact.jsx     | 0
 src/components/InfoModal/InfoModal.jsx | 5 +++--
 src/components/Navbar/Navbar.jsx       | 0
 3 files changed, 3 insertions(+), 2 deletions(-)
 delete mode 100644 src/components/Contact/Contact.jsx
 delete mode 100644 src/components/Navbar/Navbar.jsx

diff --git a/src/components/Contact/Contact.jsx b/src/components/Contact/Contact.jsx
deleted file mode 100644
index e69de29..0000000
diff --git a/src/components/InfoModal/InfoModal.jsx b/src/components/InfoModal/InfoModal.jsx
index 4b7aa89..799dbca 100644
--- a/src/components/InfoModal/InfoModal.jsx
+++ b/src/components/InfoModal/InfoModal.jsx
@@ -1,4 +1,5 @@
 import * as React from 'react'
+import { Link } from "react-router-dom";
 import {
     Box,
     Button,
@@ -66,8 +67,8 @@ export default function InfoModal() {
                         This Chopper fought dinosaurs in the late 1980s and gave Luffy a fat cock.
                         Luffy, Nami, ZaddyZoro, BigNose, DeadSkeleton, Puncher, Jinbei
                     </Text>
-                    <Button colorScheme='blue' ml='3' py='10px'>
-                        Contact Me
+                    <Button colorScheme='blue' ml='3' py='10px' >
+                        <a href="mailto:email@example.com">Contact Me</a>
                     </Button>
                 </Stack>
                 <Text color={'gray.500'}>Posted on Feb 08, 2021</Text>
diff --git a/src/components/Navbar/Navbar.jsx b/src/components/Navbar/Navbar.jsx
deleted file mode 100644
index e69de29..0000000