From 5f96c8a0fcb2b35f86a63a5402258654f5605cd3 Mon Sep 17 00:00:00 2001
From: Dries Hooghe <dries@drieshooghe.com>
Date: Wed, 12 Oct 2022 22:48:17 +0200
Subject: [PATCH] :recycle: fix merge conflict

---
 package.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/package.json b/package.json
index 70486cac..c272c614 100644
--- a/package.json
+++ b/package.json
@@ -48,14 +48,9 @@
 		}
 	},
 	"devDependencies": {
-<<<<<<< HEAD
 		"@aws-sdk/client-dynamodb": "3.186.0",
 		"@aws-sdk/util-dynamodb": "3.186.0",
-=======
-		"@aws-sdk/client-dynamodb": "3.181.0",
-		"@aws-sdk/util-dynamodb": "3.181.0",
 		"@faker-js/faker": "^7.5.0",
->>>>>>> 1d6210b (:heavy_plus_sign: add faker as a dev dependency)
 		"@nestjs/common": "9.1.2",
 		"@nestjs/core": "9.1.2",
 		"@nestjs/platform-express": "9.1.2",