fix merge

nicolas-grekas · nicolas-grekas · commit 7beeb0122548 · 2020-10-24T14:03:25.000+02:00
diff --git a/composer.json b/composer.json
@@ -28,9 +28,5 @@
             "/Tests/"
         ]
     },
-<<<<<<< HEAD:src/Symfony/Component/Notifier/composer.json
     "minimum-stability": "dev"
-=======
-    "minimum-stability": "dev"
->>>>>>> 4.4:src/Symfony/Component/Debug/composer.json
 }

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