fix merge

symfony · Oct 24, 2020 · f284e03 · f284e03
1 parent f06777b
commit f284e03
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -35,12 +35,8 @@
             "/Tests/"
         ]
     },
-<<<<<<< HEAD
     "bin": [
         "Resources/bin/yaml-lint"
     ],
     "minimum-stability": "dev"
-=======
-    "minimum-stability": "dev"
->>>>>>> 4.4
 }