fix more incorrectly resolved conflicts
This commit is contained in:
parent
a8ec304f74
commit
2d1524bf17
|
@ -4,3 +4,5 @@
|
||||||
**/proto
|
**/proto
|
||||||
**/coverage
|
**/coverage
|
||||||
**/storybook-static
|
**/storybook-static
|
||||||
|
**/examples
|
||||||
|
**/packages/status-react
|
||||||
|
|
|
@ -102,3 +102,5 @@ web-build/
|
||||||
# Tauri
|
# Tauri
|
||||||
**/src-tauri/target/
|
**/src-tauri/target/
|
||||||
|
|
||||||
|
# Local
|
||||||
|
**/.data
|
||||||
|
|
|
@ -40,7 +40,7 @@ export const Default: Story = {
|
||||||
|
|
||||||
export const Loading: Story = {
|
export const Loading: Story = {
|
||||||
args: {
|
args: {
|
||||||
loading:true
|
loading: true,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
// "noUncheckedIndexedAccess": true,
|
// "noUncheckedIndexedAccess": true,
|
||||||
// "noPropertyAccessFromIndexSignature": true /* Enforces using indexed accessors for keys declared using an indexed type */,
|
// "noPropertyAccessFromIndexSignature": true /* Enforces using indexed accessors for keys declared using an indexed type */,
|
||||||
"skipLibCheck": true,
|
"skipLibCheck": true,
|
||||||
"pretty": true
|
"pretty": true,
|
||||||
|
"resolveJsonModule": true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue