Update aws_s3.py

ansible-collections · May 25, 2021 · e0fc3ee · e0fc3ee
1 parent 19c3eaf
commit e0fc3ee
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/plugins/modules/aws_s3.py b/plugins/modules/aws_s3.py
@@ -178,10 +178,6 @@
         description:
         - version ID of the source object.
 requirements: [ "boto3", "botocore" ]
-<<<<<<< HEAD
->>>>>>> 0176b7e (s3 copy_object)
-=======
->>>>>>> ca948b6 (merge)
 author:
     - "Lester Wade (@lwade)"
     - "Sloane Hertel (@s-hertel)"