fixes: App.jsx, Footer.jsx

Author: PBJI

1Application-frontend/src/App.jsx

@@ -1,7 +1,7 @@
 import { Fragment } from "react";
 import { Routes, Route } from "react-router-dom";
-import Navbar from "./Components/Navbar.jsx";
-import Footer from "./Components/Footer.jsx";
+import Navbar from "./components/Navbar.jsx";
+import Footer from "./components/Footer.jsx";
 import Home from "./pages/Home";
 import About from "./pages/About";
 import Contact from "./pages/Contact";

1Application-frontend/src/components/Footer.jsx

@@ -1,9 +1,5 @@
 import { Fragment } from "react";
-<<<<<<< HEAD:1Application-frontend/src/Component/Footer.jsx
-import '../Css/Footer.css';
-=======
-import "../css/Footer.css";
->>>>>>> frontend/master:1Application-frontend/src/components/Footer.jsx
+import "../Css/Footer.css";
 import { Facebook, Twitter, Instagram, LinkedIn} from '@mui/icons-material'; // Import the shoes icon
 
 const Footer = () => {