Solve merge conflict

Signed-off-by: Alina Buzachis <[email protected]>
ansible-collections · May 20, 2021 · 2e68b5b · 2e68b5b
1 parent b6a260f
commit 2e68b5b
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/plugins/modules/aws_s3.py b/plugins/modules/aws_s3.py
@@ -155,8 +155,6 @@
     description:
       - KMS key id to use when encrypting objects using I(encrypting=aws:kms). Ignored if I(encryption) is not C(aws:kms).
     type: str
-<<<<<<< HEAD
-=======
   tags:
     description:
       - Tags dict to apply to the S3 object.
@@ -170,7 +168,6 @@
     default: True
     version_added: 2.0.0
 requirements: [ "boto3", "botocore" ]
->>>>>>> 	* Docs and logic fix
 author:
     - "Lester Wade (@lwade)"
     - "Sloane Hertel (@s-hertel)"