From 449bfc2a2ac41dcb7d4517b666f5113226f7847b Mon Sep 17 00:00:00 2001 From: swatimodi-scout Date: Wed, 6 Aug 2025 11:54:11 +0000 Subject: [PATCH] Resolved conflicts Signed-off-by: swatimodi-scout --- .../components-reference/supported-bindings/kinesis.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/daprdocs/content/en/reference/components-reference/supported-bindings/kinesis.md b/daprdocs/content/en/reference/components-reference/supported-bindings/kinesis.md index dfd839a8b..0b0e666a2 100644 --- a/daprdocs/content/en/reference/components-reference/supported-bindings/kinesis.md +++ b/daprdocs/content/en/reference/components-reference/supported-bindings/kinesis.md @@ -57,11 +57,7 @@ The above example uses secrets as plain strings. It is recommended to use a secr | `secretKey` | Y | Output | The AWS Secret Access Key to access this resource | `"secretAccessKey"` | | `sessionToken` | N | Output | The AWS session token to use | `"sessionToken"` | | `direction` | N | Input/Output | The direction of the binding | `"input"`, `"output"`, `"input, output"` | -<<<<<<< HEAD -| `endpoint` | N | Input | Custom endpoint for Kinesis and DynamoDB (e.g., for LocalStack support) | `"http://localhost:4566"` | -======= | `endpoint` | N | Input | Custom endpoint for Kinesis and DynamoDB (e.g., for LocalStack support) | `"http://localhost:4566"` | ->>>>>>> 8d66ac72 (docs(bindings/aws.kinesis): document new metadata for custom endpoint support e.g. LocalStack (see components-contrib#3931)) {{% alert title="Important" color="warning" %}}