Commiting the changes after the updates

widgetti · May 14, 2024 · 7be187b · 7be187b
1 parent 27c5706
commit 7be187b
Showing 1 changed file with 23 additions and 58 deletions.
diff --git a/solara/components/details.py b/solara/components/details.py
@@ -6,73 +6,38 @@
 def Details(summary="Summary", children=[], expand=False):
     """Creates an expandable/collapsible section with a summary and additional children content
 
-    <<<<<<< HEAD
-        ```solara
-        import solara
+    ```solara
+    import solara
 
 
-        show_message = solara.reactive(True)
-        disable = solara.reactive(False)
+    show_message = solara.reactive(True)
+    disable = solara.reactive(False)
 
 
-        @solara.component
-        def Page():
-           summary_text = "Click to expand for more details"
-            additional_content = [
-                "Additional detail 1",
-                "Additional detail 2",
-                "Additional detail 3"
-            ]
+    @solara.component
+    def Page():
+       summary_text = "Click to expand for more details"
+        additional_content = [
+            "Additional detail 1",
+            "Additional detail 2",
+            "Additional detail 3"
+        ]
 
-            solara.Details(
-                summary=summary_text,
-                children=additional_content,
-                expand=False
-            )
+        solara.Details(
+            summary=summary_text,
+            children=additional_content,
+            expand=False
+        )
 
-            solara.render(details_component)
-        ```
+        solara.render(details_component)
+    ```
 
 
-        ## Arguments:
+    ## Arguments:
 
-        *summary: String showing the summary text for the expandable section: Defaults "Summary"
-        *children: List showing the children content of the expandable section: Defaults to an Empty list
-        *expand: Boolean showing if the section is expanded or collapsed: Defaults to False
-    =======
-            ```solara
-            import solara
-
-
-            show_message = solara.reactive(True)
-            disable = solara.reactive(False)
-
-
-            @solara.component
-            def Page():
-               summary_text = "Click to expand for more details"
-                additional_content = [
-                    "Additional detail 1",
-                    "Additional detail 2",
-                    "Additional detail 3"
-                ]
-
-                solara.Details(
-                    summary=summary_text,
-                    children=additional_content,
-                    expand=False
-                )
-
-                solara.render(details_component)
-            ```
-
-
-            ## Arguments:
-
-            *summary: String showing the summary text for the expandable section: Defaults "Summary"
-            *children: List showing the children content of the expandable section: Defaults to an Empty list
-            *expand: Boolean showing if the section is expanded or collapsed: Defaults to False
-    >>>>>>> a83080d543479e5ed3ea8bec490ebe5e545bbe21
+    *summary: String showing the summary text for the expandable section: Defaults "Summary"
+    *children: List showing the children content of the expandable section: Defaults to an Empty list
+    *expand: Boolean showing if the section is expanded or collapsed: Defaults to False
     """
 
     expand, set_expand = solara.use_state_or_update(expand)