Composer merge conflict.

Danny7A · Sep 30, 2022 · ae9f8ae · ae9f8ae
1 parent a2548c4
commit ae9f8ae
Show file tree

Hide file tree

Showing 2 changed files with 82 additions and 360 deletions.
diff --git a/php/example_code/composer.json b/php/example_code/composer.json
@@ -15,7 +15,8 @@
       "DynamoDb\\PartiQL_Basics\\": "dynamodb/partiql_basics",
       "AwsUtilities\\": "aws_utilities",
       "Glue\\": "glue/",
-      "Iam\\": "iam/"
+      "Iam\\": "iam/",
+      "S3\\": "s3/"
     },
     "files": [
       "aws_utilities/TestableReadline.php",