fix more incorrectly resolved conflicts

This commit is contained in:
Felicio Mununga 2023-05-16 11:53:43 +02:00
parent a8ec304f74
commit 2d1524bf17
No known key found for this signature in database
GPG Key ID: 0EB8D75C775AB6F1
4 changed files with 7 additions and 2 deletions

View File

@ -4,3 +4,5 @@
**/proto **/proto
**/coverage **/coverage
**/storybook-static **/storybook-static
**/examples
**/packages/status-react

2
.gitignore vendored
View File

@ -102,3 +102,5 @@ web-build/
# Tauri # Tauri
**/src-tauri/target/ **/src-tauri/target/
# Local
**/.data

View File

@ -40,7 +40,7 @@ export const Default: Story = {
export const Loading: Story = { export const Loading: Story = {
args: { args: {
loading:true loading: true,
}, },
} }

View File

@ -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
} }
} }