merge commits resolved

Author: developer-junaid

src/App.jsx

@@ -1,37 +1,21 @@
 import React, { useEffect, useState } from "react"
 
 // Components
-<<<<<<< HEAD
-import Nav from "components/Nav/Nav";
-import Home from "components/Home/Home";
-import  Menu  from "components/Menu/Menu";
-import Portfolio from "components/Portfolio";
-import Contact from "components/Contact/Contact";
-import Services from "components/Services/Services";
-import Testimonials from "components/Testimonials/Testimonials";
-import  Footer  from "components/Footer/Footer";
-=======
 import Nav from "components/Nav/Nav"
 import Home from "components/Home/Home"
-import Portfolio from "components/Portfolio/Portfolio"
+import Menu from "components/Menu/Menu"
+import Portfolio from "components/Portfolio"
 import Contact from "components/Contact/Contact"
 import Services from "components/Services/Services"
 import Testimonials from "components/Testimonials/Testimonials"
-
->>>>>>> development
+import Footer from "components/Footer/Footer"
 // Sanity
 import sanityClient from "client"
 
 // Animation
 import Aos from "aos"
 import "aos/dist/aos.css"
 
-<<<<<<< HEAD
-=======
-// Components
-import { Menu } from "components/Menu/Menu"
->>>>>>> development
-
 function App() {
   const [menuOpen, setMenuOpen] = useState(false)
   const [projects, setProjects] = useState([])