Update aws_s3.py

ansible-collections · May 25, 2021 · 8676009 · 8676009
1 parent 57d09d9
commit 8676009
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/plugins/modules/aws_s3.py b/plugins/modules/aws_s3.py
@@ -156,7 +156,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
   copy_src:
     description:
     - The source details of the object to copy.
@@ -179,8 +178,6 @@
         description:
         - version ID of the source object.
 requirements: [ "boto3", "botocore" ]
-=======
->>>>>>> dff146be9cb89b0e4857a721dd02103d084cb0fc
 author:
     - "Lester Wade (@lwade)"
     - "Sloane Hertel (@s-hertel)"