Merge branch 'dev' into 'main'

navbars name

See merge request frontend/marketplace!66
This commit is contained in:
Nastya 2023-10-28 21:05:46 +00:00
commit 0a8d46e086
12 changed files with 2 additions and 2 deletions

@ -1,5 +1,5 @@
import { Outlet } from "react-router-dom"; import { Outlet } from "react-router-dom";
import Navbar from "./Navbar/Navbar"; import Navbar from "./NavbarSite/Navbar";
import { import {
Ticket, Ticket,
getMessageFromFetchError, getMessageFromFetchError,

@ -6,7 +6,7 @@ import Section4 from "./Section4";
import Section5 from "./Section5"; import Section5 from "./Section5";
import FloatingSupportChat from "@root/components/FloatingSupportChat/FloatingSupportChat"; import FloatingSupportChat from "@root/components/FloatingSupportChat/FloatingSupportChat";
import Footer from "@root/components/Footer"; import Footer from "@root/components/Footer";
import Navbar from "@root/components/NavbarOld/Navbar"; import Navbar from "@root/components/NavbarLanding/Navbar";
import { theme } from "@root/utils/theme"; import { theme } from "@root/utils/theme";
export default function Landing() { export default function Landing() {