fix more incorrectly resolved conflicts

2023-05-16 11:53:43 +02:00 · 2023-05-16 11:53:43 +02:00 · 2d1524bf17
parent a8ec304f74
commit 2d1524bf17
4 changed files with 7 additions and 2 deletions
--- a/.eslintignore
+++ b/.eslintignore
@ -4,3 +4,5 @@
 **/proto
 **/coverage
 **/storybook-static
+**/examples
+**/packages/status-react
--- a/.gitignore
+++ b/.gitignore
@ -102,3 +102,5 @@ web-build/
 # Tauri
 **/src-tauri/target/

+# Local
+**/.data
--- a/packages/components/src/community/sidebar-community/sidebar-community.stories.tsx
+++ b/packages/components/src/community/sidebar-community/sidebar-community.stories.tsx
@ -40,7 +40,7 @@ export const Default: Story = {

 export const Loading: Story = {
  args: {
-    loading:true
+    loading: true,
  },
 }

--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@ -26,6 +26,7 @@
    // "noUncheckedIndexedAccess": true,
    // "noPropertyAccessFromIndexSignature": true /* Enforces using indexed accessors for keys declared using an indexed type */,
    "skipLibCheck": true,
-    "pretty": true
+    "pretty": true,
+    "resolveJsonModule": true
  }
 }