fixed composer.json

2026-09-15 20:06:31 +00:00 · 2019-08-08 00:48:20 +02:00
parent 97971ce57d
commit 80a7e3e538
1 changed files with 0 additions and 4 deletions
@@ -46,11 +46,7 @@
    },
    "extra": {
        "branch-alias": {
-<<<<<<< HEAD
            "dev-master": "3.0-dev"
-=======
-            "dev-master": "2.12-dev"
->>>>>>> 2.x
        }
    }
 }