Merge branch '4.4' into 5.1

nicolas-grekas · nicolas-grekas · commit d37c7eb055f2 · 2020-10-13T14:46:35.000+02:00
* 4.4:
  Fix merge
diff --git a/composer.json b/composer.json
@@ -29,13 +29,7 @@
         ]
     },
     "minimum-stability": "dev",
-<<<<<<< HEAD:src/Symfony/Component/Notifier/composer.json
     "extra": {
         "branch-version": "5.1-dev"
     }
-=======
-    "extra": {
-        "branch-version": "5.1-dev"
-    }
->>>>>>> 4.4:src/Symfony/Component/Debug/composer.json
 }

Original file line number	Diff line number	Diff line change
`@@ -29,13 +29,7 @@`
`29`	`29`	`]`
`30`	`30`	`},`
`31`	`31`	`"minimum-stability": "dev",`
`32`		`-<<<<<<< HEAD:src/Symfony/Component/Notifier/composer.json`
`33`	`32`	`"extra": {`
`34`	`33`	`"branch-version": "5.1-dev"`
`35`	`34`	`}`
`36`		`-=======`
`37`		`- "extra": {`
`38`		`- "branch-version": "5.1-dev"`
`39`		`- }`
`40`		`->>>>>>> 4.4:src/Symfony/Component/Debug/composer.json`
`41`	`35`	`}`