fianl

.gitignore

@@ -1,23 +1 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# production
-/build
-
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
+node_modules

src/About.js

@@ -5,12 +5,21 @@ const About = () => {
     <div className='About_page'>
    <div style={{marginTop:50,display:'flex',flexDirection:'column',fontSize:20,fontWeight:600}}>
     <h1>About Us</h1>
+<<<<<<< HEAD
     <div style={{padding:'1rem',marginTop:-60,width:'100%',display:'flex',flexWrap:'wrap-reverse',justifyContent:'center',gap:0,alignItems:'center'}}>
       <div style={{flex:'1.8 0 20rem',maxWidth:'80%',display:'flex',justifyContent:'center',alignItems:'center'}}>
       <p style={{fontSize:18,fontWeight:500,textAlign:'left'}}>
 At our core, we're passionate about crafting unforgettable culinary experiences. With a commitment to quality ingredients and creative flair, we strive to delight taste buds and create lasting memories. Our journey began with a vision to redefine traditional flavors and elevate dining experiences. Guided by innovation and a dedication to excellence, we aim to be your go-to destination for gastronomic adventures. Welcome to a world where every dish tells a story, and every bite is an invitation to savor the extraordinary.</p>
 </div>
     <div  style={{flex:'1.5 0 20rem',display:'flex',justifyContent:'center',alignItems:'center'}}>
+=======
+    <div style={{marginTop:-50,width:'100%',display:'flex',flexWrap:'wrap-reverse',justifyContent:'center',gap:0,alignItems:'center'}}>
+      <div style={{flex:'1 0 10rem',maxWidth:'80%',display:'flex',justifyContent:'center',alignItems:'center'}}>
+      <p style={{fontSize:18,fontWeight:500,textAlign:'left'}}>
+At our core, we're passionate about crafting unforgettable culinary experiences. With a commitment to quality ingredients and creative flair, we strive to delight taste buds and create lasting memories. Our journey began with a vision to redefine traditional flavors and elevate dining experiences. Guided by innovation and a dedication to excellence, we aim to be your go-to destination for gastronomic adventures. Welcome to a world where every dish tells a story, and every bite is an invitation to savor the extraordinary.</p>
+</div>
+    <div  style={{flex:'1 0 10rem',display:'flex',justifyContent:'center',alignItems:'center'}}>
+>>>>>>> refs/remotes/origin/main
     <img src={require('./assets/icons/about_page_logo.png')} alt='about' style={{height:350,objectFit:'contain',display:'grid',alignSelf:'center'}} />
     </div>
     </div>
@@ -34,4 +43,4 @@ At our core, we're passionate about crafting unforgettable culinary experiences.
   )
 }
 
-export default About
+export default About

src/Booknow.css

@@ -1,9 +1,13 @@
 .golden_chief{
     display: flex;
+<<<<<<< HEAD
     padding-top: 6rem;
+=======
+>>>>>>> refs/remotes/origin/main
     flex-direction: column;
     justify-content: center;
     align-items: center;
+    padding-top:6rem;
     width: 100%;
 }
 .golden_chief div{
@@ -17,7 +21,11 @@
 .golden_chief div #content{
     display: flex;
     max-width: 90%;
+<<<<<<< HEAD
     flex: 1 0 20rem;
+=======
+    flex: 1 0 10rem;
+>>>>>>> refs/remotes/origin/main
     flex-direction: column;
     justify-content: center;
     align-items: center;
@@ -28,7 +36,11 @@
   font-size: 1.2rem;
 }
 .golden_chief div #image{
+<<<<<<< HEAD
   flex: 1 0 20rem;
+=======
+  flex: 1 0 10rem;
+>>>>>>> refs/remotes/origin/main
   display: flex;
   justify-content: center;
   align-items: center;