Merge pull request #111 from DataMini/main--merge-conflict

frei-l · web-flow · commit fe67024af9e1 · 2025-01-08T12:48:43.000+08:00
NOTICE: Stainless generated code has conflicted with your custom code
diff --git a/src/asktable/resources/datasources/datasources.py b/src/asktable/resources/datasources/datasources.py
@@ -424,6 +424,7 @@ def delete_file(
             ),
             cast_to=object,
         )
+
     def add_file_and_update_meta(
         self,
         datasource_id: str,
@@ -490,6 +491,7 @@ def create_from_file(
             timeout=timeout,
         )
 
+
 class AsyncDatasourcesResource(AsyncAPIResource):
     @cached_property
     def meta(self) -> AsyncMetaResource:

Original file line number	Diff line number	Diff line change
`@@ -424,6 +424,7 @@ def delete_file(`
`424`	`424`	`),`
`425`	`425`	`cast_to=object,`
`426`	`426`	`)`
	`427`	`+`
`427`	`428`	`def add_file_and_update_meta(`
`428`	`429`	`self,`
`429`	`430`	`datasource_id: str,`
`@@ -490,6 +491,7 @@ def create_from_file(`
`490`	`491`	`timeout=timeout,`
`491`	`492`	`)`
`492`	`493`
	`494`	`+`
`493`	`495`	`class AsyncDatasourcesResource(AsyncAPIResource):`
`494`	`496`	`@cached_property`
`495`	`497`	`def meta(self) -> AsyncMetaResource:`