Merge branch 'master' of github.com:zingimmick/coding-standard

zingimmick · Aug 6, 2020 · 8dee836 · 8dee836
2 parents 1dd7685 + 0b79c04
commit 8dee836
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -23,7 +23,8 @@
     "roave/security-advisories": "dev-master"
   },
   "conflict": {
-    "rector/rector": ">=0.7.54,<=0.7.57"
+    "rector/rector": ">=0.7.54,<=0.7.57 || 0.7.62",
+    "symplify/easy-coding-standard": ">=8.1.20"
   },
   "autoload-dev": {
     "psr-4": {