fix merge

symfony · Oct 24, 2020 · 7beeb01 · 7beeb01
1 parent 75ce9b4
commit 7beeb01
Showing 1 changed file with 0 additions and 4 deletions.
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
 }