From f3d5abbf42305f024195388eb354e95c3f43aff9 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Thu, 3 Nov 2016 13:30:49 +1300
Subject: [PATCH] Remove obsolete branch-alias

---
 composer.json | 46 +++++++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/composer.json b/composer.json
index 42191db..fea1fcc 100644
--- a/composer.json
+++ b/composer.json
@@ -1,26 +1,22 @@
 {
-	"name": "silverstripe/installer",
-	"description": "The SilverStripe Framework Installer",
-	"require": {
-		"php": ">=5.5.0",
-		"silverstripe/cms": "4.0.x-dev",
-		"silverstripe/framework": "4.0.x-dev",
-		"silverstripe/reports": "4.0.x-dev",
-		"silverstripe/siteconfig": "4.0.x-dev",
-		"silverstripe-themes/simple": "~3.2.0",
-		"silverstripe/asset-admin": "1.0.x-dev"
-	},
-	"require-dev": {
-		"phpunit/PHPUnit": "~4.8"
-	},
-	"extra": {
-		"branch-alias": {
-			"dev-master": "4.0.x-dev"
-		}
-	},
-	"config": {
-		"process-timeout": 600
-	},
-	"prefer-stable": true,
-	"minimum-stability": "dev"
-}
+    "name": "silverstripe/installer",
+    "description": "The SilverStripe Framework Installer",
+    "require": {
+        "php": ">=5.5.0",
+        "silverstripe/cms": "4.0.x-dev",
+        "silverstripe/framework": "4.0.x-dev",
+        "silverstripe/reports": "4.0.x-dev",
+        "silverstripe/siteconfig": "4.0.x-dev",
+        "silverstripe-themes/simple": "~3.2.0",
+        "silverstripe/asset-admin": "1.0.x-dev"
+    },
+    "require-dev": {
+        "phpunit/PHPUnit": "~4.8"
+    },
+    "extra": [],
+    "config": {
+        "process-timeout": 600
+    },
+    "prefer-stable": true,
+    "minimum-stability": "dev"
+}
\ No newline at end of file