gofnnp/w-aura
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into 'develop'

Browse Source 
# Conflicts:
#   src/components/App/index.tsx
#   src/components/BirthdayPage/index.tsx
#   src/components/pages/BirthPlacePage/index.tsx
#   src/routes.ts
This commit is contained in:
Daniil Chemerkin 2024-04-17 23:29:42 +00:00
commit daec6325b6
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/BirthdayPage/index.tsx
View File

@ -84,4 +84,4 @@ function BirthdayPage(): JSX.Element {
); );
} }
export default BirthdayPage; export default BirthdayPage;

2
src/components/pages/BirthPlacePage/index.tsx
View File

@ -45,4 +45,4 @@ function BirthPlacePage() {
); );
} }
export default BirthPlacePage; export default BirthPlacePage;

2
src/routes.ts
View File

@ -461,4 +461,4 @@ export const getRouteBy = (status: UserStatus): string => {
} }
}; };
export default routes; export default routes;