Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix]: merge conflict 실수로 build error가 생겼습니다. #194

Merged
merged 2 commits into from
Jan 21, 2025
Merged

[Fix]: merge conflict 실수로 build error가 생겼습니다. #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1426f6e
fix: merge conflict
soulchicken Jan 21, 2025
936e2dd
fix: conflict 해결 중 어디선가 나타난 파일 중복
soulchicken Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions apps/wow-docs/app/foundation/grid/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import { breakpointItems, gridItems } from "@constants/store";
import type { Metadata } from "next/types";
import Divider from "wowds-ui/Divider";

import { breakpointItems, gridItems } from "../../../constants/store";

export const metadata: Metadata = {
title: "Grid",
description: "와우 디자인 시스템의 Grid 입니다.",
Expand Down
3 changes: 1 addition & 2 deletions apps/wow-docs/components/ImageCards.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ import Card from "@components/Card";
import Space from "@components/Space";
import Title from "@components/Text/Title";
import Image from "next/image";

import type { ReactNode } from "react";
import type { CSSProperties, ReactNode } from "react";

export type Item = {
main: string;
Expand Down
63 changes: 0 additions & 63 deletions apps/wow-docs/constants/store/girdData.ts
View file
Open in desktop

This file was deleted.