resolving conflict

dust-tt · Nov 28, 2024 · 39e0e2e · 39e0e2e
1 parent e72106e
commit 39e0e2e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/sparkle/src/components/Card.tsx b/sparkle/src/components/Card.tsx
@@ -143,4 +143,4 @@ export type {
   CardRootProps,
   CardSubtitleProps,
   CardTitleProps,
-};
+};
diff --git a/sparkle/src/stories/Card.stories.tsx b/sparkle/src/stories/Card.stories.tsx
@@ -119,4 +119,4 @@ export const Composable: Story = {
       </ComposableCard.Footer>
     </ComposableCard.Root>
   ),
-};
+};
-Original file line number
+Diff line change
@@ Expand Up / @@ -119,4 +119,4 @@ export const Composable: Story = { @@
           </ComposableCard.Footer>
         </ComposableCard.Root>
       ),
-    };
+    };