From 2f7751f0dfe69e17a61c5f3a03a631215856c89b Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 6 Oct 2020 13:56:58 +0200
Subject: [PATCH] fix merge

---
 src/Symfony/Component/Mailer/Bridge/Amazon/composer.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json b/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json
index 704fc51dcd..4e953cc22b 100644
--- a/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json
+++ b/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json
@@ -28,10 +28,6 @@
             "/Tests/"
         ]
     },
-<<<<<<< HEAD:src/Symfony/Component/Mailer/Bridge/Amazon/composer.json
     "minimum-stability": "dev",
     "version": "4.4-dev"
-=======
-    "version": "3.4-dev"
->>>>>>> 3.4:src/Symfony/Component/ClassLoader/composer.json
 }