mirror of
https://github.com/maybe-finance/maybe.git
synced 2025-08-09 07:25:19 +02:00
resolve merge conflicts
This commit is contained in:
commit
13bc12ba94
2 changed files with 1 additions and 11 deletions
|
@ -1,5 +0,0 @@
|
||||||
{
|
|
||||||
"extends": "../tsconfig.json",
|
|
||||||
"compilerOptions": {},
|
|
||||||
"include": ["**/*.ts", "**/*.tsx", "**/**/*.ts", "**/**/*.tsx"]
|
|
||||||
}
|
|
|
@ -27,10 +27,5 @@
|
||||||
"next-env.d.ts",
|
"next-env.d.ts",
|
||||||
".next/types/**/*.ts"
|
".next/types/**/*.ts"
|
||||||
],
|
],
|
||||||
"exclude": ["node_modules", "jest.config.ts"],
|
"exclude": ["node_modules", "jest.config.ts"]
|
||||||
"references": [
|
|
||||||
{
|
|
||||||
"path": "./.storybook/tsconfig.json"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue