fix merge

nicolas-grekas · nicolas-grekas · commit 2f7751f0dfe6 · 2020-10-06T13:56:58.000+02:00
diff --git 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
 }

Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,6 @@`
`28`	`28`	`"/Tests/"`
`29`	`29`	`]`
`30`	`30`	`},`
`31`		`-<<<<<<< HEAD:src/Symfony/Component/Mailer/Bridge/Amazon/composer.json`
`32`	`31`	`"minimum-stability": "dev",`
`33`	`32`	`"version": "4.4-dev"`
`34`		`-=======`
`35`		`- "version": "3.4-dev"`
`36`		`->>>>>>> 3.4:src/Symfony/Component/ClassLoader/composer.json`
`37`	`33`	`}`