Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feature/sub-directory-hosting' i…
Browse files Browse the repository at this point in the history
…nto feature/sub-directory-hosting

# Conflicts:
#	components/layout/cardBackground.tsx
#	components/league/table/teamCell.tsx
  • Loading branch information
testusuke committed Oct 6, 2024
2 parents a0e1a86 + 9cd76a5 commit ccd53a4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions components/layout/cardBackground.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {Button, Card, Stack, Typography} from "@mui/material";
import {Button, Card, Stack, Typography, useTheme} from "@mui/material";
import React, {ReactNode} from 'react';
import NextLink from "next/link";
import {red} from "@mui/material/colors";

type CardProps = {
title?: string;
Expand Down

0 comments on commit ccd53a4

Please sign in to comment.