resolve merge conflict

Signed-off-by: Hannah Hunter <[email protected]>
dapr · Jan 26, 2024 · d600ba6 · d600ba6
2 parents 4b389d3 + 60f4fe3
commit d600ba6
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/daprdocs/content/en/reference/components-reference/supported-bindings/s3.md b/daprdocs/content/en/reference/components-reference/supported-bindings/s3.md
@@ -151,12 +151,12 @@ To use the S3 component, you need to use an existing bucket. Follow the [AWS doc
 
 This component supports **output binding** with the following operations:
 
-- `create` : [Create file](#create-file)
-- `get` : [Get file](#get-file)
-- `delete` : [Delete file](#delete-file)
-- `list`: [List file](#list-files)
+- `create` : [Create object](#create-object)
+- `get` : [Get object](#get-object)
+- `delete` : [Delete object](#delete-object)
+- `list`: [List objects](#list-objects)
 
-### Create file
+### Create object
 
 To perform a create operation, invoke the AWS S3 binding with a `POST` method and the following JSON body: