[#134] 🐛 solve merge conflicts

KingNono1030 · KingNono1030 · commit dcdcc59fb7ff · 2024-11-28T21:36:28.000+09:00
diff --git a/src/stories/shared/pagination/Pagination.stories.tsx b/src/stories/shared/pagination/Pagination.stories.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, StoryObj } from '@storybook/react'
 
 import { Pagination } from '@/components/shared/pagination'

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import React from 'react'`
`2`		`-`
`3`	`1`	`import { Meta, StoryObj } from '@storybook/react'`
`4`	`2`
`5`	`3`	`import { Pagination } from '@/components/shared/pagination'`