fix: update merge conflict
This commit is contained in:
parent
b68acf1595
commit
085205b248
@ -8,9 +8,6 @@ import storybook from 'eslint-plugin-storybook'
|
||||
import tailwind from 'eslint-plugin-tailwindcss'
|
||||
import reactHooks from 'eslint-plugin-react-hooks'
|
||||
import reactRefresh from 'eslint-plugin-react-refresh'
|
||||
import globals from 'globals'
|
||||
import storybook from 'eslint-plugin-storybook'
|
||||
import tailwind from 'eslint-plugin-tailwindcss'
|
||||
|
||||
export default combine(
|
||||
stylistic({
|
||||
|
Loading…
Reference in New Issue
Block a user