Merge branch '4.4' into 5.1

nicolas-grekas · nicolas-grekas · commit 9f2a66871c90 · 2020-10-06T13:57:58.000+02:00
* 4.4:
  fix merge
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json b/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json
@@ -30,14 +30,6 @@
             "/Tests/"
         ]
     },
-<<<<<<< HEAD:src/Symfony/Component/Mailer/Bridge/Amazon/composer.json
     "minimum-stability": "dev",
-<<<<<<< HEAD
     "version": "5.1-dev"
-=======
-    "version": "4.4-dev"
-=======
-    "version": "3.4-dev"
->>>>>>> 3.4:src/Symfony/Component/ClassLoader/composer.json
->>>>>>> 4.4
 }
diff --git a/src/Symfony/Component/Notifier/composer.json b/src/Symfony/Component/Notifier/composer.json
@@ -29,9 +29,5 @@
         ]
     },
     "minimum-stability": "dev",
-<<<<<<< HEAD:src/Symfony/Component/Notifier/composer.json
     "version": "5.1-dev"
-=======
-    "version": "4.4-dev"
->>>>>>> 4.4:src/Symfony/Component/Debug/composer.json
 }

Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,5 @@`
`29`	`29`	`]`
`30`	`30`	`},`
`31`	`31`	`"minimum-stability": "dev",`
`32`		`-<<<<<<< HEAD:src/Symfony/Component/Notifier/composer.json`
`33`	`32`	`"version": "5.1-dev"`
`34`		`-=======`
`35`		`- "version": "4.4-dev"`
`36`		`->>>>>>> 4.4:src/Symfony/Component/Debug/composer.json`
`37`	`33`	`}`