MAGETWO-33609: resolve merge conflict

Joan He · Joan He · commit 18f28d282936 · 2015-02-12T13:53:12.000-06:00
diff --git a/app/code/Magento/Developer/composer.json b/app/code/Magento/Developer/composer.json
@@ -3,7 +3,6 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-
         "magento/framework": "0.42.0-beta7",
         "magento/magento-composer-installer": "*"
     },
