fix merge conflict after composer version become incorrect.

Simonas Šerlinskas · Simonas Šerlinskas · commit a9e4bfe361d1 · 2017-02-03T08:55:42.000+02:00
diff --git a/composer.json b/composer.json
@@ -34,7 +34,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "5.1-dev"
+            "dev-master": "5.0-dev"
         }
     }
 }
