Fix conflicts

Webador · Oct 7, 2014 · bc42792 · bc42792
2 parents ff21536 + 0ff1853
commit bc42792
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -40,7 +40,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.4.0-beta2"
+            "dev-master": "0.5.0-dev"
         }
     },
     "autoload": {