From 5b6dec927fb6f7e74f2887c1af83761522c06c0d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Aug 2022 19:34:05 +0000
Subject: [PATCH] Bump aws-sdk from 2.1195.0 to 2.1204.0

Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.1195.0 to 2.1204.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.1195.0...v2.1204.0)

---
updated-dependencies:
- dependency-name: aws-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index d963de2..7133851 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "aws-sdk": "^2.1195.0",
+    "aws-sdk": "^2.1204.0",
     "next": "12.2.5",
     "react": "18.2.0",
     "react-dom": "18.2.0",
diff --git a/yarn.lock b/yarn.lock
index 5fde312..48c4189 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -180,17 +180,10 @@ available-typed-arrays@^1.0.5:
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
   integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
-<<<<<<< HEAD
-aws-sdk@^2.1194.0:
+aws-sdk@^2.1204.0:
   version "2.1204.0"
   resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1204.0.tgz#6e0c5d0b4b50ff122b66772bb0ab5453009e6106"
   integrity sha512-H3dRQBdgzAfZ/e/dfiW44fhQrgAuCfIzWhI5y5J9122caI4uZY6TEUd003UXP4nXq2eMfuPWg0bA/mPwbj8RkA==
-=======
-aws-sdk@^2.1195.0:
-  version "2.1195.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1195.0.tgz#f6f091426934ba1a4f8d5138f568e840f7bdb51a"
-  integrity sha512-xU7177JhKM+4SsLnoA6/r3qGzSXmbLgw/YC1KRHvZyJCbuTY+vdAGLaldbtNXjjwmE3a6EeoCREANv8GY62VdQ==
->>>>>>> 79e1be47334c4e46565125b9da5b03709c149e51
   dependencies:
     buffer "4.9.2"
     events "1.1.1"