Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
lydiacho committed Aug 16, 2024
2 parents 849bd46 + b785abb commit c886a2f
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/common/components/Layout/index.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { PropsWithChildren } from 'react';
import { Outlet } from 'react-router-dom';

import Head from './components/Head';
import Header from './components/Header';
import Head from './components/settings/Head';
import ScrollToTop from './components/settings/ScrollToTop';
import ScrollToTop from './components/ScrollToTop';
import { container, mainWrapper } from './style.css';

const Layout = ({ children }: PropsWithChildren) => {
Expand Down

0 comments on commit c886a2f

Please sign in to comment.