Fixed conflicts (#25)

JBZoo · Mar 5, 2023 · 5f4dc89 · 5f4dc89
1 parent 98837b0
commit 5f4dc89
Show file tree

Hide file tree

Showing 2 changed files with 786 additions and 754 deletions.
diff --git a/composer.json b/composer.json
@@ -43,10 +43,10 @@
         "ext-simplexml"   : "*",
         "ext-hash"        : "*",
 
-        "jbzoo/data"      : "^5.0",
-        "jbzoo/utils"     : "^5.0",
-        "jbzoo/cli"       : "^2.0",
-        "jbzoo/markdown"  : "^1.2",
+        "jbzoo/data"      : "^5.0|dev-master|7.x-dev",
+        "jbzoo/utils"     : "^5.0|dev-master|7.x-dev",
+        "jbzoo/cli"       : "^2.0|dev-master|7.x-dev",
+        "jbzoo/markdown"  : "^1.2|dev-master|7.x-dev",
 
         "symfony/console" : ">=4.4"
     },
@@ -67,10 +67,14 @@
     },
 
     "autoload-dev" : {
-        "classmap" : ["tests"]
+        "classmap" : [
+            "tests"
+        ]
     },
 
-    "bin"          : ["ci-report-converter"],
+    "bin"          : [
+        "ci-report-converter"
+    ],
 
     "config"       : {
         "optimize-autoloader" : true,
@@ -81,7 +85,7 @@
 
     "extra"        : {
         "branch-alias" : {
-            "dev-master" : "2.x-dev"
+            "dev-master" : "7.x-dev"
         }
     }
 }